Merge vm1.(none):/home/stever/bk/newmem-head
authorSteve Reinhardt <stever@eecs.umich.edu>
Fri, 22 Jun 2007 16:24:33 +0000 (09:24 -0700)
committerSteve Reinhardt <stever@eecs.umich.edu>
Fri, 22 Jun 2007 16:24:33 +0000 (09:24 -0700)
commit4d1bcbcd36e5735e76b38abb151de716c31a2272
tree58c29ad6905c45332e1d1d12b9d66596ae6d30d4
parentbdd5fd20fb19eb52ef812cd284094e5513646e36
parent470a6a9a74eb28a5052e6492c0a3aa9724c57500
Merge vm1.(none):/home/stever/bk/newmem-head
into  vm1.(none):/home/stever/bk/newmem-cache2

--HG--
extra : convert_revision : 1da75335907fee2d1745ec13e515819dfe2aad89