Merge zizzer:/bk/newmem
authorKorey Sewell <ksewell@umich.edu>
Fri, 9 Jun 2006 21:47:23 +0000 (17:47 -0400)
committerKorey Sewell <ksewell@umich.edu>
Fri, 9 Jun 2006 21:47:23 +0000 (17:47 -0400)
into  zizzer.eecs.umich.edu:/.automount/zooks/y/ksewell/research/m5-sim/newmem-release

--HG--
extra : convert_revision : 82b83199a36059d4b402f89f7db2de299ea59c1e


Trivial merge