Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Mon, 21 May 2007 06:05:02 +0000 (23:05 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Mon, 21 May 2007 06:05:02 +0000 (23:05 -0700)
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : a8efe71a50b9ae480c5ad0aabd7aa9ba22bc2968


Trivial merge