Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Fri, 26 Jan 2007 23:50:28 +0000 (18:50 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Fri, 26 Jan 2007 23:50:28 +0000 (18:50 -0500)
into  zeep.pool:/z/saidi/work/m5.suncc

--HG--
extra : convert_revision : 1706f6218abec7eb575dcff3ad4aef83894f64ab


Trivial merge