Merge zizzer:/bk/newmem
authorKorey Sewell <ksewell@umich.edu>
Wed, 10 May 2006 22:34:26 +0000 (18:34 -0400)
committerKorey Sewell <ksewell@umich.edu>
Wed, 10 May 2006 22:34:26 +0000 (18:34 -0400)
into  zazzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem

--HG--
extra : convert_revision : 0a146eed200abd2c18f135b112987c5cf91a649b


Trivial merge