Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
authorKorey Sewell <ksewell@umich.edu>
Sun, 23 Jul 2006 17:41:53 +0000 (13:41 -0400)
committerKorey Sewell <ksewell@umich.edu>
Sun, 23 Jul 2006 17:41:53 +0000 (13:41 -0400)
into  zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-o3

--HG--
extra : convert_revision : be1e5dcb1c5025db8526e628c2060b1790d38227


Trivial merge