Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Wed, 29 Mar 2006 22:37:41 +0000 (17:37 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Wed, 29 Mar 2006 22:37:41 +0000 (17:37 -0500)
into  zeep.eecs.umich.edu:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 5ab4ce9f6ec7af326d8906060ae3558cfd67ca08


Trivial merge