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

--HG--
extra : convert_revision : b73eeb1f73a5886a008919acd9e1971a79fd6bfb


Trivial merge