Merge zizzer.eecs.umich.edu:/bk/m5
authorNathan Binkert <binkertn@umich.edu>
Wed, 25 Feb 2004 21:13:00 +0000 (16:13 -0500)
committerNathan Binkert <binkertn@umich.edu>
Wed, 25 Feb 2004 21:13:00 +0000 (16:13 -0500)
into ziff.eecs.umich.edu:/z/binkertn/research/m5/latest

--HG--
extra : convert_revision : 2a258d16ba51ce34f5748825a94b456abfb577cc


Trivial merge