Merge zizzer.eecs.umich.edu:/bk/newmem
authorGabe Black <gblack@eecs.umich.edu>
Sat, 10 Mar 2007 22:46:25 +0000 (17:46 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Sat, 10 Mar 2007 22:46:25 +0000 (17:46 -0500)
into  zower.eecs.umich.edu:/home/gblack/m5/newmem-statetrace-test

--HG--
extra : convert_revision : df36efd84d938e0e402648b85b3732ed786aaa29


Trivial merge