Merge gblack@m5.eecs.umich.edu:/bk/multiarch
authorGabe Black <gblack@eecs.umich.edu>
Thu, 9 Feb 2006 19:48:10 +0000 (14:48 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Thu, 9 Feb 2006 19:48:10 +0000 (14:48 -0500)
into  ewok.(none):/home/gblack/m5/multiarch

--HG--
extra : convert_revision : ae574fbee484019d318ef25034bd4a7e18354aab


Trivial merge