Merge zizzer.eecs.umich.edu:/bk/newmem
authorSteve Reinhardt <stever@eecs.umich.edu>
Mon, 12 Feb 2007 17:27:32 +0000 (09:27 -0800)
committerSteve Reinhardt <stever@eecs.umich.edu>
Mon, 12 Feb 2007 17:27:32 +0000 (09:27 -0800)
into  vm1.(none):/home/stever/bk/newmem-head

--HG--
extra : convert_revision : 496428e23050122a8a0029e5fddea261bef5729e


Trivial merge