Merge zizzer:/bk/newmem
authorLisa Hsu <hsul@eecs.umich.edu>
Thu, 26 Oct 2006 20:04:27 +0000 (16:04 -0400)
committerLisa Hsu <hsul@eecs.umich.edu>
Thu, 26 Oct 2006 20:04:27 +0000 (16:04 -0400)
into  zed.eecs.umich.edu:/z/hsul/work/m5/clean

--HG--
extra : convert_revision : cb3f718bdcbd52540747a2696fb37bb4fcfe27a3


Trivial merge