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

--HG--
extra : convert_revision : 48356df2faf42dc2b715497464f03103ed5ea01b


Trivial merge