Merge gblack@m5.eecs.umich.edu:/bk/multiarch

into  ewok.(none):/home/gblack/m5/multiarch

--HG--
extra : convert_revision : 41a0e8c0b2d328bee958126f395369d4549aabfc

SConscript

@@ -400,7 +400,7 @@ def ISAScan():
                                 "SRCDIR",
                                 '^[ \t]*##[ \t]*include[ \t]*"([^>"]+)"')
 
-def ISAPath(env, dir, a=None):
+def ISAPath(env, dir, target=None, source=None, a=None):
    return (Dir(env['SRCDIR']), Dir('.'))   
 
 iscan = Scanner(function = ISAScan().scan, skeys = [".isa", ".ISA"],