Merge zizzer:/bk/newmem
authorRon Dreslinski <rdreslin@umich.edu>
Mon, 16 Apr 2007 15:32:09 +0000 (11:32 -0400)
committerRon Dreslinski <rdreslin@umich.edu>
Mon, 16 Apr 2007 15:32:09 +0000 (11:32 -0400)
into  zazzer.eecs.umich.edu:/z/rdreslin/m5bk/head

--HG--
extra : convert_revision : 8630b3771678b68d5cd12a61f7a4de2e3443a8d7


Trivial merge