Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Sun, 27 May 2007 00:10:35 +0000 (17:10 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Sun, 27 May 2007 00:10:35 +0000 (17:10 -0700)
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : c2540bfd34eb5a6f41cb15ffe50f8ec72f80abb1


Trivial merge