Merge zizzer:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Tue, 30 Jan 2007 03:57:18 +0000 (22:57 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 30 Jan 2007 03:57:18 +0000 (22:57 -0500)
into  zower.eecs.umich.edu:/eecshome/m5/newmem

--HG--
extra : convert_revision : 0e4a54c21f32fec13deaf00b5d61c258007f172b


Trivial merge