Merge zizzer:/z/m5/Bitkeeper/newmem
authorRon Dreslinski <rdreslin@umich.edu>
Fri, 7 Apr 2006 22:16:11 +0000 (18:16 -0400)
committerRon Dreslinski <rdreslin@umich.edu>
Fri, 7 Apr 2006 22:16:11 +0000 (18:16 -0400)
into  zazzer.eecs.umich.edu:/z/rdreslin/m5bk/newmem

--HG--
extra : convert_revision : 85406b562373f7d768a44a8c327055cb02d3f6c5


Trivial merge