Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Fri, 22 Jun 2007 16:24:33 +0000 (09:24 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Fri, 22 Jun 2007 16:24:33 +0000 (09:24 -0700)
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : 1da75335907fee2d1745ec13e515819dfe2aad89


Trivial merge