Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Fri, 27 Oct 2006 06:34:26 +0000 (02:34 -0400)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 27 Oct 2006 06:34:26 +0000 (02:34 -0400)
into  zeep.eecs.umich.edu:/home/gblack/m5/newmem

--HG--
extra : convert_revision : ec35a9276ae21e0b9fe820bd700c020e4440a350


Trivial merge