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

--HG--
extra : convert_revision : f940480672861185a494f3fae1bfca13d31fed9f


Trivial merge