Merge gblack@m5.eecs.umich.edu:/bk/multiarch
authorGabe Black <gblack@eecs.umich.edu>
Wed, 8 Mar 2006 13:09:45 +0000 (08:09 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Wed, 8 Mar 2006 13:09:45 +0000 (08:09 -0500)
into  ewok.(none):/home/gblack/m5/multiarch

--HG--
extra : convert_revision : 5fe5a3d70774d6420b890237d9be4a5d0f00d17e


Trivial merge