Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Thu, 2 Nov 2006 00:25:20 +0000 (19:25 -0500)
committerLisa Hsu <hsul@eecs.umich.edu>
Thu, 2 Nov 2006 00:25:20 +0000 (19:25 -0500)
into  zed.eecs.umich.edu:/z/hsul/work/m5/newmem

--HG--
extra : convert_revision : a30e2da1f0a272b8c867c0e7a3491118be92bc5e


Trivial merge