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

--HG--
extra : convert_revision : 26921dad179699b7868768361143aaa8d790b8fc


Trivial merge