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

--HG--
extra : convert_revision : 41a0e8c0b2d328bee958126f395369d4549aabfc


Trivial merge