Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Sun, 28 Jan 2007 20:55:44 +0000 (15:55 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Sun, 28 Jan 2007 20:55:44 +0000 (15:55 -0500)
into  pb15.local:/Users/ali/work/m5.newmem.head

--HG--
extra : convert_revision : b4db0b350c8a5b3452ede74e5b42eec8ed6685c3


Trivial merge