Merge gblack@m5.eecs.umich.edu:/bk/multiarch
authorGabe Black <gblack@eecs.umich.edu>
Fri, 24 Feb 2006 23:45:46 +0000 (18:45 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Fri, 24 Feb 2006 23:45:46 +0000 (18:45 -0500)
into  ewok.(none):/home/gblack/m5/multiarch

--HG--
extra : convert_revision : d3e160f6e938af5d2118883f8d7c91fa29a0ccaa


Trivial merge