Merge gblack@m5.eecs.umich.edu:/bk/multiarch
authorGabe Black <gblack@eecs.umich.edu>
Wed, 8 Feb 2006 06:04:32 +0000 (01:04 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 8 Feb 2006 06:04:32 +0000 (01:04 -0500)
into  ewok.(none):/home/gblack/m5/multiarch

--HG--
extra : convert_revision : c7caf571575fb0e7136770864371300d3f11787e


Trivial merge