Merge gblack@m5.eecs.umich.edu:/bk/multiarch
authorGabe Black <gblack@eecs.umich.edu>
Sat, 4 Mar 2006 08:19:58 +0000 (03:19 -0500)
committerGabe Black <gblack@eecs.umich.edu>
Sat, 4 Mar 2006 08:19:58 +0000 (03:19 -0500)
into  ewok.(none):/home/gblack/m5/multiarch

--HG--
extra : convert_revision : cb6de8d050ac5abb8f61eb5780deeb06e93b1a0c

1  2 
SConscript

diff --cc SConscript
Simple merge