Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Fri, 22 Jun 2007 23:13:53 +0000 (16:13 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Fri, 22 Jun 2007 23:13:53 +0000 (16:13 -0700)
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : aa50af3094f5d459f75b514179b6e3ec5e0bf1df


Trivial merge