Merge zizzer.eecs.umich.edu:/bk/newmem
authorSteve Reinhardt <stever@eecs.umich.edu>
Mon, 28 May 2007 22:41:05 +0000 (15:41 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Mon, 28 May 2007 22:41:05 +0000 (15:41 -0700)
into  vm1.(none):/home/stever/bk/newmem-head

--HG--
extra : convert_revision : f93aaeabed0da9eeec8eb6f055fb1e31d5d97203


Trivial merge