Merge zizzer.eecs.umich.edu:/bk/newmem
authorSteve Reinhardt <stever@eecs.umich.edu>
Mon, 13 Nov 2006 06:04:00 +0000 (22:04 -0800)
committerSteve Reinhardt <stever@eecs.umich.edu>
Mon, 13 Nov 2006 06:04:00 +0000 (22:04 -0800)
into  vm1.(none):/home/stever/bk/newmem-head

--HG--
extra : convert_revision : faab7569deefde94c20133b2f70a8567bcaa2960


Trivial merge