Merge gblack@m5.eecs.umich.edu:/bk/multiarch
authorGabe Black <gblack@eecs.umich.edu>
Sun, 12 Feb 2006 17:17:51 +0000 (12:17 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Sun, 12 Feb 2006 17:17:51 +0000 (12:17 -0500)
into  ewok.(none):/home/gblack/m5/multiarch

--HG--
extra : convert_revision : baf9b0eb84df7da8152ddf9a25264e041a24b8ca


Trivial merge