Merge zower.eecs.umich.edu:/home/gblack/m5/newmem-statetrace
authorGabe Black <gblack@eecs.umich.edu>
Sun, 11 Mar 2007 01:52:55 +0000 (20:52 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 11 Mar 2007 01:52:55 +0000 (20:52 -0500)
into  zower.eecs.umich.edu:/home/gblack/m5/newmem-statetrace-test

--HG--
extra : convert_revision : dc02bb6b4e5cc7f0260da80a71b9713f75566a29


Trivial merge