Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Mon, 23 Apr 2007 18:41:13 +0000 (14:41 -0400)
committerLisa Hsu <hsul@eecs.umich.edu>
Mon, 23 Apr 2007 18:41:13 +0000 (14:41 -0400)
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : ab72745ed43ef2925cae82c46d55c8328589731c


Trivial merge