Merge zizzer:/bk/multiarch
authorKorey Sewell <ksewell@umich.edu>
Fri, 10 Feb 2006 08:31:13 +0000 (03:31 -0500)
committerKorey Sewell <ksewell@umich.edu>
Fri, 10 Feb 2006 08:31:13 +0000 (03:31 -0500)
into  zazzer.eecs.umich.edu:/z/ksewell/research/m5-sim/m5-multiarch

--HG--
extra : convert_revision : c78773ba1acb2c6a45f0e92d80fdfc7f23ea6973


Trivial merge