Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Mon, 30 Oct 2006 18:33:38 +0000 (13:33 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Mon, 30 Oct 2006 18:33:38 +0000 (13:33 -0500)
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : ce5f394a4a62f7452b9631763425f65b911387bb


Trivial merge