Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Wed, 30 May 2007 05:25:57 +0000 (22:25 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Wed, 30 May 2007 05:25:57 +0000 (22:25 -0700)
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : 72c6f2ce7e9e2b46e59711a2c3cfe770c243018e


Trivial merge