Merge gblack@m5.eecs.umich.edu:/bk/multiarch
authorGabe Black <gblack@eecs.umich.edu>
Tue, 21 Feb 2006 04:54:38 +0000 (23:54 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Tue, 21 Feb 2006 04:54:38 +0000 (23:54 -0500)
into  ewok.(none):/home/gblack/m5/multiarch

--HG--
extra : convert_revision : 9d386beecc6d13625ff19ca72cbc3628dcd59d3c


Trivial merge