Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Tue, 31 Oct 2006 18:24:00 +0000 (13:24 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Tue, 31 Oct 2006 18:24:00 +0000 (13:24 -0500)
into  zeep.pool:/z/saidi/work/m5.newmem.head

--HG--
extra : convert_revision : 42712a50ca46ebc891b78186f4b6d1412a35d374


Trivial merge