Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Sun, 10 Dec 2006 06:05:30 +0000 (22:05 -0800)
committerSteve Reinhardt <stever@eecs.umich.edu>
Sun, 10 Dec 2006 06:05:30 +0000 (22:05 -0800)
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : e1ed5c8edb95e99200b4d26317f55f71338a96df


Trivial merge