Merge zizzer.eecs.umich.edu:/bk/newmem
authorNathan Binkert <binkertn@umich.edu>
Fri, 27 Apr 2007 20:59:44 +0000 (13:59 -0700)
committerNathan Binkert <binkertn@umich.edu>
Fri, 27 Apr 2007 20:59:44 +0000 (13:59 -0700)
into  iceaxe.:/Users/nate/work/m5/incoming

--HG--
extra : convert_revision : d0141a8f2b56be297af3368e3fbdd9600857206d


Trivial merge