Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Fri, 16 Mar 2007 03:21:52 +0000 (23:21 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Fri, 16 Mar 2007 03:21:52 +0000 (23:21 -0400)
into  pb15.local:/Users/ali/work/m5.newmem

--HG--
extra : convert_revision : 0aa2fadf8978ae30ebe4fde03c525e6b9115117a


Trivial merge