Merge zizzer.eecs.umich.edu:/m5/Bitkeeper/m5
authorNathan Binkert <binkertn@umich.edu>
Thu, 6 May 2004 16:10:16 +0000 (12:10 -0400)
committerNathan Binkert <binkertn@umich.edu>
Thu, 6 May 2004 16:10:16 +0000 (12:10 -0400)
into zizzer.eecs.umich.edu:/.automount/ziff/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 12234085865daa71e32981177d3376c93b3ed11e


Trivial merge