Merge zizzer:/bk/multiarch
authorKorey Sewell <ksewell@umich.edu>
Wed, 15 Feb 2006 03:43:26 +0000 (22:43 -0500)
committerKorey Sewell <ksewell@umich.edu>
Wed, 15 Feb 2006 03:43:26 +0000 (22:43 -0500)
into  zazzer.eecs.umich.edu:/z/ksewell/research/m5-sim/m5-multiarch

--HG--
extra : convert_revision : 5b0a3dd1a52ca9b29ea4a1c505a7435bfd6110fe


Trivial merge