Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Tue, 11 Apr 2006 17:43:15 +0000 (13:43 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Tue, 11 Apr 2006 17:43:15 +0000 (13:43 -0400)
into  zeep.eecs.umich.edu:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : ef75b46b9c1c267c84e6bb2b2234d46c4edcda16


Trivial merge