Merge zizzer:/bk/multiarch
authorAli Saidi <saidi@eecs.umich.edu>
Wed, 1 Feb 2006 22:52:40 +0000 (17:52 -0500)
committerAli Saidi <saidi@eecs.umich.edu>
Wed, 1 Feb 2006 22:52:40 +0000 (17:52 -0500)
into  zeep.eecs.umich.edu:/z/saidi/work/m5.multiarch

--HG--
extra : convert_revision : 88b5214973ecc2f5c0428da21b65b09c767ae31d


Trivial merge