Merge zizzer:/bk/newmem
authorKorey Sewell <ksewell@umich.edu>
Thu, 12 Oct 2006 18:36:41 +0000 (14:36 -0400)
committerKorey Sewell <ksewell@umich.edu>
Thu, 12 Oct 2006 18:36:41 +0000 (14:36 -0400)
into  zooks.eecs.umich.edu:/y/ksewell/research/m5-sim/cleanrepo

--HG--
extra : convert_revision : 86abc4dabb7c72edc90fae951314d6a6b5c73705


Trivial merge