Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Fri, 15 Dec 2006 23:07:39 +0000 (18:07 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Fri, 15 Dec 2006 23:07:39 +0000 (18:07 -0500)
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : a6a40a3bc2e07bc7828de08fa2ce1c847105483d


Trivial merge