Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Wed, 8 Nov 2006 20:06:17 +0000 (15:06 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Wed, 8 Nov 2006 20:06:17 +0000 (15:06 -0500)
into  zeep.pool:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 643e28482e6739bd264a9c2d69c17279853aa0c5


Trivial merge