Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Sun, 18 Jun 2006 15:10:19 +0000 (11:10 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Sun, 18 Jun 2006 15:10:19 +0000 (11:10 -0400)
into  zeep.eecs.umich.edu:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 1b2352532b6e1d1e180f3debd66588a450a46923


Trivial merge