Merge zizzer.eecs.umich.edu:/z/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Sun, 10 Dec 2006 07:05:33 +0000 (02:05 -0500)
committerSteve Reinhardt <stever@eecs.umich.edu>
Sun, 10 Dec 2006 07:05:33 +0000 (02:05 -0500)
into  zizzer.eecs.umich.edu:/z/stever/bk/newmem-cache3

--HG--
extra : convert_revision : c961d1bf2acaae6807870b78f444a4a606be65cc


Trivial merge