Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/newmem
authorKorey Sewell <ksewell@umich.edu>
Fri, 7 Jul 2006 19:58:22 +0000 (15:58 -0400)
committerKorey Sewell <ksewell@umich.edu>
Fri, 7 Jul 2006 19:58:22 +0000 (15:58 -0400)
into  zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-o3

--HG--
extra : convert_revision : f97469b7d19c82deb3d068f80546d729757c25e3


Trivial merge