Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Thu, 28 Jun 2007 15:28:58 +0000 (08:28 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Thu, 28 Jun 2007 15:28:58 +0000 (08:28 -0700)
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : b1c954c187e3b3172a194396ba63808253121195


Trivial merge