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

--HG--
extra : convert_revision : 77dc4dda9c72c871364e112ae8b10669b8d8fc86

1  2 
SConscript

diff --cc SConscript
Simple merge