Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Wed, 12 Apr 2006 21:46:32 +0000 (17:46 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Wed, 12 Apr 2006 21:46:32 +0000 (17:46 -0400)
into  zeep.eecs.umich.edu:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 5fc80b28362c4acc4dee576f60296b81aea004f2


Trivial merge