Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Tue, 5 Dec 2006 05:35:48 +0000 (21:35 -0800)
committerSteve Reinhardt <stever@eecs.umich.edu>
Tue, 5 Dec 2006 05:35:48 +0000 (21:35 -0800)
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : e456687d940c833d8255a88633555778480f7825


Trivial merge