209 files changed, 11 insertions, 10 deletions

diff --git a/.gitignore b/.gitignore
index 613cf495..d2c8acb1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,10 +13,10 @@ Makefile
 rebar.config
 
 # scons building
-.sconf_temp/
-.sconsign.dblite
-build/
-config.log
+couchjs/.sconf_temp/
+couchjs/.sconsign.dblite
+couchjs/build/
+couchjs/config.log
 *.pyc
 
 # testing
diff --git a/.rebar/templates/Makefile b/.rebar/templates/Makefile
index 647994f6..62797111 100644
--- a/.rebar/templates/Makefile
+++ b/.rebar/templates/Makefile
@@ -2,7 +2,8 @@ all:  compile
 
 compile:
 	@ERL_LIBS="`pwd`/apps" ./rebar compile
-	python scons/scons.py
+	@echo "==> couchjs (compile)"
+	@cd couchjs && python scons/scons.py
 
 clean:
 	@./rebar clean
@@ -18,8 +19,8 @@ dist: compile
 	@rm -rf rel/dbcore
 	@./rebar generate
 	@mkdir -p rel/dbcore/var/share/server
-	@cp build/main.js rel/dbcore/var/share/server/
-	@cp build/couchjs rel/dbcore/bin/
+	@cp couchjs/build/main.js rel/dbcore/var/share/server/
+	@cp couchjs/build/couchjs rel/dbcore/bin/
 
 distclean: clean
 	@rm -rf rel/dbcore
diff --git a/SConstruct b/couchjs/SConstruct
index 53f0d771..ef4ad21d 100644
--- a/SConstruct
+++ b/couchjs/SConstruct
@@ -12,5 +12,5 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-SConscript(['apps/couch/c_src/couch_js/SConscript'], variant_dir='build')
-SConscript(['apps/couch/js/SConscript'])
+SConscript(['c_src/SConscript'], variant_dir='build')
+SConscript(['js/SConscript'])
diff --git a/apps/couch/c_src/couch_js/SConscript b/couchjs/c_src/SConscript
index b459ee94..b459ee94 100644
--- a/apps/couch/c_src/couch_js/SConscript
+++ b/couchjs/c_src/SConscript
diff --git a/apps/couch/c_src/couch_js/http.c b/couchjs/c_src/http.c
index b781f0ef..b781f0ef 100644
--- a/apps/couch/c_src/couch_js/http.c
+++ b/couchjs/c_src/http.c
diff --git a/apps/couch/c_src/couch_js/http.h b/couchjs/c_src/http.h
index b5f8c70f..b5f8c70f 100644
--- a/apps/couch/c_src/couch_js/http.h
+++ b/couchjs/c_src/http.h
diff --git a/apps/couch/c_src/couch_js/main.c b/couchjs/c_src/main.c
index 25acaf55..25acaf55 100644
--- a/apps/couch/c_src/couch_js/main.c
+++ b/couchjs/c_src/main.c
diff --git a/apps/couch/c_src/couch_js/utf8.c b/couchjs/c_src/utf8.c
index 57928ba9..57928ba9 100644
--- a/apps/couch/c_src/couch_js/utf8.c
+++ b/couchjs/c_src/utf8.c
diff --git a/apps/couch/c_src/couch_js/utf8.h b/couchjs/c_src/utf8.h
index 00f6b736..00f6b736 100644
--- a/apps/couch/c_src/couch_js/utf8.h
+++ b/couchjs/c_src/utf8.h
diff --git a/apps/couch/js/SConscript b/couchjs/js/SConscript
index db635665..8ac0e037 100644
--- a/apps/couch/js/SConscript
+++ b/couchjs/js/SConscript
@@ -19,5 +19,5 @@ env['BUILDERS']['Cat'] = Builder(action = '''
 ''')
 
 ## don't Glob() because loop.js must come last
-env.Cat('../../../build/main.js', ['json2.js', 'filter.js', 'mimeparse.js',
+env.Cat('../build/main.js', ['json2.js', 'filter.js', 'mimeparse.js',
     'render.js', 'state.js', 'util.js', 'validate.js', 'views.js', 'loop.js'])
diff --git a/apps/couch/js/filter.js b/couchjs/js/filter.js
index 1e8556a4..1e8556a4 100644
--- a/apps/couch/js/filter.js
+++ b/couchjs/js/filter.js
diff --git a/apps/couch/js/json2.js b/couchjs/js/json2.js
index 39d8f370..39d8f370 100644
--- a/apps/couch/js/json2.js
+++ b/couchjs/js/json2.js
diff --git a/apps/couch/js/loop.js b/couchjs/js/loop.js
index 300151e9..300151e9 100644
--- a/apps/couch/js/loop.js
+++ b/couchjs/js/loop.js
diff --git a/apps/couch/js/mimeparse.js b/couchjs/js/mimeparse.js
index 3642a194..3642a194 100644
--- a/apps/couch/js/mimeparse.js
+++ b/couchjs/js/mimeparse.js
diff --git a/apps/couch/js/render.js b/couchjs/js/render.js
index 9dcfbcd6..9dcfbcd6 100644
--- a/apps/couch/js/render.js
+++ b/couchjs/js/render.js
diff --git a/apps/couch/js/state.js b/couchjs/js/state.js
index 9af9e475..9af9e475 100644
--- a/apps/couch/js/state.js
+++ b/couchjs/js/state.js
diff --git a/apps/couch/js/util.js b/couchjs/js/util.js
index 9cc464c3..9cc464c3 100644
--- a/apps/couch/js/util.js
+++ b/couchjs/js/util.js
diff --git a/apps/couch/js/validate.js b/couchjs/js/validate.js
index 76a14129..76a14129 100644
--- a/apps/couch/js/validate.js
+++ b/couchjs/js/validate.js
diff --git a/apps/couch/js/views.js b/couchjs/js/views.js
index ffe63377..ffe63377 100644
--- a/apps/couch/js/views.js
+++ b/couchjs/js/views.js
diff --git a/scons/scons-LICENSE b/couchjs/scons/scons-LICENSE
index 790d9714..790d9714 100644
--- a/scons/scons-LICENSE
+++ b/couchjs/scons/scons-LICENSE
diff --git a/scons/scons-README b/couchjs/scons/scons-README
index 32b691cf..32b691cf 100644
--- a/scons/scons-README
+++ b/couchjs/scons/scons-README
diff --git a/scons/scons-local-2.0.1/SCons/Action.py b/couchjs/scons/scons-local-2.0.1/SCons/Action.py
index 4300dd49..4300dd49 100644
--- a/scons/scons-local-2.0.1/SCons/Action.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Action.py
diff --git a/scons/scons-local-2.0.1/SCons/Builder.py b/couchjs/scons/scons-local-2.0.1/SCons/Builder.py
index 0592bb49..0592bb49 100644
--- a/scons/scons-local-2.0.1/SCons/Builder.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Builder.py
diff --git a/scons/scons-local-2.0.1/SCons/CacheDir.py b/couchjs/scons/scons-local-2.0.1/SCons/CacheDir.py
index 68ee1ca6..68ee1ca6 100644
--- a/scons/scons-local-2.0.1/SCons/CacheDir.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/CacheDir.py
diff --git a/scons/scons-local-2.0.1/SCons/Conftest.py b/couchjs/scons/scons-local-2.0.1/SCons/Conftest.py
index 04a6bc2a..04a6bc2a 100644
--- a/scons/scons-local-2.0.1/SCons/Conftest.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Conftest.py
diff --git a/scons/scons-local-2.0.1/SCons/Debug.py b/couchjs/scons/scons-local-2.0.1/SCons/Debug.py
index f4eb65f2..f4eb65f2 100644
--- a/scons/scons-local-2.0.1/SCons/Debug.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Debug.py
diff --git a/scons/scons-local-2.0.1/SCons/Defaults.py b/couchjs/scons/scons-local-2.0.1/SCons/Defaults.py
index f6b0fd11..f6b0fd11 100644
--- a/scons/scons-local-2.0.1/SCons/Defaults.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Defaults.py
diff --git a/scons/scons-local-2.0.1/SCons/Environment.py b/couchjs/scons/scons-local-2.0.1/SCons/Environment.py
index d5206fae..d5206fae 100644
--- a/scons/scons-local-2.0.1/SCons/Environment.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Environment.py
diff --git a/scons/scons-local-2.0.1/SCons/Errors.py b/couchjs/scons/scons-local-2.0.1/SCons/Errors.py
index 63f9d417..63f9d417 100644
--- a/scons/scons-local-2.0.1/SCons/Errors.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Errors.py
diff --git a/scons/scons-local-2.0.1/SCons/Executor.py b/couchjs/scons/scons-local-2.0.1/SCons/Executor.py
index b31e3483..b31e3483 100644
--- a/scons/scons-local-2.0.1/SCons/Executor.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Executor.py
diff --git a/scons/scons-local-2.0.1/SCons/Job.py b/couchjs/scons/scons-local-2.0.1/SCons/Job.py
index 7866bb40..7866bb40 100644
--- a/scons/scons-local-2.0.1/SCons/Job.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Job.py
diff --git a/scons/scons-local-2.0.1/SCons/Memoize.py b/couchjs/scons/scons-local-2.0.1/SCons/Memoize.py
index c76d6a52..c76d6a52 100644
--- a/scons/scons-local-2.0.1/SCons/Memoize.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Memoize.py
diff --git a/scons/scons-local-2.0.1/SCons/Node/Alias.py b/couchjs/scons/scons-local-2.0.1/SCons/Node/Alias.py
index c0f3ecee..c0f3ecee 100644
--- a/scons/scons-local-2.0.1/SCons/Node/Alias.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Node/Alias.py
diff --git a/scons/scons-local-2.0.1/SCons/Node/FS.py b/couchjs/scons/scons-local-2.0.1/SCons/Node/FS.py
index 0997fc07..0997fc07 100644
--- a/scons/scons-local-2.0.1/SCons/Node/FS.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Node/FS.py
diff --git a/scons/scons-local-2.0.1/SCons/Node/Python.py b/couchjs/scons/scons-local-2.0.1/SCons/Node/Python.py
index 32450059..32450059 100644
--- a/scons/scons-local-2.0.1/SCons/Node/Python.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Node/Python.py
diff --git a/scons/scons-local-2.0.1/SCons/Node/__init__.py b/couchjs/scons/scons-local-2.0.1/SCons/Node/__init__.py
index b7377987..b7377987 100644
--- a/scons/scons-local-2.0.1/SCons/Node/__init__.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Node/__init__.py
diff --git a/scons/scons-local-2.0.1/SCons/Options/BoolOption.py b/couchjs/scons/scons-local-2.0.1/SCons/Options/BoolOption.py
index 46099672..46099672 100644
--- a/scons/scons-local-2.0.1/SCons/Options/BoolOption.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Options/BoolOption.py
diff --git a/scons/scons-local-2.0.1/SCons/Options/EnumOption.py b/couchjs/scons/scons-local-2.0.1/SCons/Options/EnumOption.py
index 1357984c..1357984c 100644
--- a/scons/scons-local-2.0.1/SCons/Options/EnumOption.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Options/EnumOption.py
diff --git a/scons/scons-local-2.0.1/SCons/Options/ListOption.py b/couchjs/scons/scons-local-2.0.1/SCons/Options/ListOption.py
index 1f34cd6d..1f34cd6d 100644
--- a/scons/scons-local-2.0.1/SCons/Options/ListOption.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Options/ListOption.py
diff --git a/scons/scons-local-2.0.1/SCons/Options/PackageOption.py b/couchjs/scons/scons-local-2.0.1/SCons/Options/PackageOption.py
index 1bb88b1d..1bb88b1d 100644
--- a/scons/scons-local-2.0.1/SCons/Options/PackageOption.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Options/PackageOption.py
diff --git a/scons/scons-local-2.0.1/SCons/Options/PathOption.py b/couchjs/scons/scons-local-2.0.1/SCons/Options/PathOption.py
index 2e38de3e..2e38de3e 100644
--- a/scons/scons-local-2.0.1/SCons/Options/PathOption.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Options/PathOption.py
diff --git a/scons/scons-local-2.0.1/SCons/Options/__init__.py b/couchjs/scons/scons-local-2.0.1/SCons/Options/__init__.py
index edb62732..edb62732 100644
--- a/scons/scons-local-2.0.1/SCons/Options/__init__.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Options/__init__.py
diff --git a/scons/scons-local-2.0.1/SCons/PathList.py b/couchjs/scons/scons-local-2.0.1/SCons/PathList.py
index 4b27193f..4b27193f 100644
--- a/scons/scons-local-2.0.1/SCons/PathList.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/PathList.py
diff --git a/scons/scons-local-2.0.1/SCons/Platform/__init__.py b/couchjs/scons/scons-local-2.0.1/SCons/Platform/__init__.py
index 7621e40a..7621e40a 100644
--- a/scons/scons-local-2.0.1/SCons/Platform/__init__.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Platform/__init__.py
diff --git a/scons/scons-local-2.0.1/SCons/Platform/aix.py b/couchjs/scons/scons-local-2.0.1/SCons/Platform/aix.py
index 821c9da9..821c9da9 100644
--- a/scons/scons-local-2.0.1/SCons/Platform/aix.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Platform/aix.py
diff --git a/scons/scons-local-2.0.1/SCons/Platform/cygwin.py b/couchjs/scons/scons-local-2.0.1/SCons/Platform/cygwin.py
index 8370ea61..8370ea61 100644
--- a/scons/scons-local-2.0.1/SCons/Platform/cygwin.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Platform/cygwin.py
diff --git a/scons/scons-local-2.0.1/SCons/Platform/darwin.py b/couchjs/scons/scons-local-2.0.1/SCons/Platform/darwin.py
index 3a9c9eb4..3a9c9eb4 100644
--- a/scons/scons-local-2.0.1/SCons/Platform/darwin.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Platform/darwin.py
diff --git a/scons/scons-local-2.0.1/SCons/Platform/hpux.py b/couchjs/scons/scons-local-2.0.1/SCons/Platform/hpux.py
index 77d6db39..77d6db39 100644
--- a/scons/scons-local-2.0.1/SCons/Platform/hpux.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Platform/hpux.py
diff --git a/scons/scons-local-2.0.1/SCons/Platform/irix.py b/couchjs/scons/scons-local-2.0.1/SCons/Platform/irix.py
index ff0c323c..ff0c323c 100644
--- a/scons/scons-local-2.0.1/SCons/Platform/irix.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Platform/irix.py
diff --git a/scons/scons-local-2.0.1/SCons/Platform/os2.py b/couchjs/scons/scons-local-2.0.1/SCons/Platform/os2.py
index cdb4082b..cdb4082b 100644
--- a/scons/scons-local-2.0.1/SCons/Platform/os2.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Platform/os2.py
diff --git a/scons/scons-local-2.0.1/SCons/Platform/posix.py b/couchjs/scons/scons-local-2.0.1/SCons/Platform/posix.py
index 87de9dfc..87de9dfc 100644
--- a/scons/scons-local-2.0.1/SCons/Platform/posix.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Platform/posix.py
diff --git a/scons/scons-local-2.0.1/SCons/Platform/sunos.py b/couchjs/scons/scons-local-2.0.1/SCons/Platform/sunos.py
index 15011071..15011071 100644
--- a/scons/scons-local-2.0.1/SCons/Platform/sunos.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Platform/sunos.py
diff --git a/scons/scons-local-2.0.1/SCons/Platform/win32.py b/couchjs/scons/scons-local-2.0.1/SCons/Platform/win32.py
index 7a232aef..7a232aef 100644
--- a/scons/scons-local-2.0.1/SCons/Platform/win32.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Platform/win32.py
diff --git a/scons/scons-local-2.0.1/SCons/SConf.py b/couchjs/scons/scons-local-2.0.1/SCons/SConf.py
index 7b434367..7b434367 100644
--- a/scons/scons-local-2.0.1/SCons/SConf.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/SConf.py
diff --git a/scons/scons-local-2.0.1/SCons/SConsign.py b/couchjs/scons/scons-local-2.0.1/SCons/SConsign.py
index 0d78a6d6..0d78a6d6 100644
--- a/scons/scons-local-2.0.1/SCons/SConsign.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/SConsign.py
diff --git a/scons/scons-local-2.0.1/SCons/Scanner/C.py b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/C.py
index 3ac769ae..3ac769ae 100644
--- a/scons/scons-local-2.0.1/SCons/Scanner/C.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/C.py
diff --git a/scons/scons-local-2.0.1/SCons/Scanner/D.py b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/D.py
index 2293ddd0..2293ddd0 100644
--- a/scons/scons-local-2.0.1/SCons/Scanner/D.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/D.py
diff --git a/scons/scons-local-2.0.1/SCons/Scanner/Dir.py b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/Dir.py
index df0de4e6..df0de4e6 100644
--- a/scons/scons-local-2.0.1/SCons/Scanner/Dir.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/Dir.py
diff --git a/scons/scons-local-2.0.1/SCons/Scanner/Fortran.py b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/Fortran.py
index 63d34e49..63d34e49 100644
--- a/scons/scons-local-2.0.1/SCons/Scanner/Fortran.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/Fortran.py
diff --git a/scons/scons-local-2.0.1/SCons/Scanner/IDL.py b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/IDL.py
index 8ccda1b4..8ccda1b4 100644
--- a/scons/scons-local-2.0.1/SCons/Scanner/IDL.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/IDL.py
diff --git a/scons/scons-local-2.0.1/SCons/Scanner/LaTeX.py b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/LaTeX.py
index ae542cf5..ae542cf5 100644
--- a/scons/scons-local-2.0.1/SCons/Scanner/LaTeX.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/LaTeX.py
diff --git a/scons/scons-local-2.0.1/SCons/Scanner/Prog.py b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/Prog.py
index 03121323..03121323 100644
--- a/scons/scons-local-2.0.1/SCons/Scanner/Prog.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/Prog.py
diff --git a/scons/scons-local-2.0.1/SCons/Scanner/RC.py b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/RC.py
index 9013a093..9013a093 100644
--- a/scons/scons-local-2.0.1/SCons/Scanner/RC.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/RC.py
diff --git a/scons/scons-local-2.0.1/SCons/Scanner/__init__.py b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/__init__.py
index 1a8dcbcb..1a8dcbcb 100644
--- a/scons/scons-local-2.0.1/SCons/Scanner/__init__.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Scanner/__init__.py
diff --git a/scons/scons-local-2.0.1/SCons/Script/Interactive.py b/couchjs/scons/scons-local-2.0.1/SCons/Script/Interactive.py
index e2906d4e..e2906d4e 100644
--- a/scons/scons-local-2.0.1/SCons/Script/Interactive.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Script/Interactive.py
diff --git a/scons/scons-local-2.0.1/SCons/Script/Main.py b/couchjs/scons/scons-local-2.0.1/SCons/Script/Main.py
index 31bcff3d..31bcff3d 100644
--- a/scons/scons-local-2.0.1/SCons/Script/Main.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Script/Main.py
diff --git a/scons/scons-local-2.0.1/SCons/Script/SConsOptions.py b/couchjs/scons/scons-local-2.0.1/SCons/Script/SConsOptions.py
index 8afedf63..8afedf63 100644
--- a/scons/scons-local-2.0.1/SCons/Script/SConsOptions.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Script/SConsOptions.py
diff --git a/scons/scons-local-2.0.1/SCons/Script/SConscript.py b/couchjs/scons/scons-local-2.0.1/SCons/Script/SConscript.py
index 5e896f1f..5e896f1f 100644
--- a/scons/scons-local-2.0.1/SCons/Script/SConscript.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Script/SConscript.py
diff --git a/scons/scons-local-2.0.1/SCons/Script/__init__.py b/couchjs/scons/scons-local-2.0.1/SCons/Script/__init__.py
index b4545ecb..b4545ecb 100644
--- a/scons/scons-local-2.0.1/SCons/Script/__init__.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Script/__init__.py
diff --git a/scons/scons-local-2.0.1/SCons/Sig.py b/couchjs/scons/scons-local-2.0.1/SCons/Sig.py
index 2a9bc8ea..2a9bc8ea 100644
--- a/scons/scons-local-2.0.1/SCons/Sig.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Sig.py
diff --git a/scons/scons-local-2.0.1/SCons/Subst.py b/couchjs/scons/scons-local-2.0.1/SCons/Subst.py
index 84e71503..84e71503 100644
--- a/scons/scons-local-2.0.1/SCons/Subst.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Subst.py
diff --git a/scons/scons-local-2.0.1/SCons/Taskmaster.py b/couchjs/scons/scons-local-2.0.1/SCons/Taskmaster.py
index 019b2d74..019b2d74 100644
--- a/scons/scons-local-2.0.1/SCons/Taskmaster.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Taskmaster.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/386asm.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/386asm.py
index 1ba99fa3..1ba99fa3 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/386asm.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/386asm.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/BitKeeper.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/BitKeeper.py
index 8c8991a1..8c8991a1 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/BitKeeper.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/BitKeeper.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/CVS.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/CVS.py
index 5d511f05..5d511f05 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/CVS.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/CVS.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/FortranCommon.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/FortranCommon.py
index 21941582..21941582 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/FortranCommon.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/FortranCommon.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/JavaCommon.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/JavaCommon.py
index 0a38409a..0a38409a 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/JavaCommon.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/JavaCommon.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/MSCommon/__init__.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/MSCommon/__init__.py
index 780a97cc..780a97cc 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/MSCommon/__init__.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/MSCommon/__init__.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/MSCommon/arch.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/MSCommon/arch.py
index 28ef0f17..28ef0f17 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/MSCommon/arch.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/MSCommon/arch.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/MSCommon/common.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/MSCommon/common.py
index 9f3df2d8..9f3df2d8 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/MSCommon/common.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/MSCommon/common.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/MSCommon/netframework.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/MSCommon/netframework.py
index 66c5586c..66c5586c 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/MSCommon/netframework.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/MSCommon/netframework.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/MSCommon/sdk.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/MSCommon/sdk.py
index 63559983..63559983 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/MSCommon/sdk.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/MSCommon/sdk.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/MSCommon/vc.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/MSCommon/vc.py
index 0aeb3e78..0aeb3e78 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/MSCommon/vc.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/MSCommon/vc.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/MSCommon/vs.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/MSCommon/vs.py
index 529d443a..529d443a 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/MSCommon/vs.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/MSCommon/vs.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/Perforce.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/Perforce.py
index 9ae64b87..9ae64b87 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/Perforce.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/Perforce.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/PharLapCommon.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/PharLapCommon.py
index 7d7a0225..7d7a0225 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/PharLapCommon.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/PharLapCommon.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/RCS.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/RCS.py
index 10e3e715..10e3e715 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/RCS.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/RCS.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/SCCS.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/SCCS.py
index 1cedb0ad..1cedb0ad 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/SCCS.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/SCCS.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/Subversion.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/Subversion.py
index 57081846..57081846 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/Subversion.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/Subversion.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/__init__.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/__init__.py
index 416d8de2..416d8de2 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/__init__.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/__init__.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/aixc++.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/aixc++.py
index bc2d0e8b..bc2d0e8b 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/aixc++.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/aixc++.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/aixcc.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/aixcc.py
index c1dcb168..c1dcb168 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/aixcc.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/aixcc.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/aixf77.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/aixf77.py
index 477ec302..477ec302 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/aixf77.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/aixf77.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/aixlink.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/aixlink.py
index eba4916a..eba4916a 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/aixlink.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/aixlink.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/applelink.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/applelink.py
index a23a4378..a23a4378 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/applelink.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/applelink.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/ar.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/ar.py
index dab95868..dab95868 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/ar.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/ar.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/as.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/as.py
index 7d5f8722..7d5f8722 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/as.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/as.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/bcc32.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/bcc32.py
index 664c3de0..664c3de0 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/bcc32.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/bcc32.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/c++.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/c++.py
index e19523be..e19523be 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/c++.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/c++.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/cc.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/cc.py
index 291673f4..291673f4 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/cc.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/cc.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/cvf.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/cvf.py
index 7c2114df..7c2114df 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/cvf.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/cvf.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/default.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/default.py
index ddd5c347..ddd5c347 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/default.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/default.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/dmd.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/dmd.py
index 2a48b95f..2a48b95f 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/dmd.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/dmd.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/dvi.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/dvi.py
index 6fcb96dd..6fcb96dd 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/dvi.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/dvi.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/dvipdf.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/dvipdf.py
index fb5627e3..fb5627e3 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/dvipdf.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/dvipdf.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/dvips.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/dvips.py
index de840533..de840533 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/dvips.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/dvips.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/f77.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/f77.py
index cc2c8522..cc2c8522 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/f77.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/f77.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/f90.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/f90.py
index a2c61472..a2c61472 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/f90.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/f90.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/f95.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/f95.py
index cadf23ee..cadf23ee 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/f95.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/f95.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/filesystem.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/filesystem.py
index 290d8d5d..290d8d5d 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/filesystem.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/filesystem.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/fortran.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/fortran.py
index ae0960ad..ae0960ad 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/fortran.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/fortran.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/g++.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/g++.py
index dcd24064..dcd24064 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/g++.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/g++.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/g77.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/g77.py
index f5bea8bf..f5bea8bf 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/g77.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/g77.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/gas.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/gas.py
index 637a111c..637a111c 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/gas.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/gas.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/gcc.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/gcc.py
index c93c05f3..c93c05f3 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/gcc.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/gcc.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/gfortran.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/gfortran.py
index ed522f42..ed522f42 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/gfortran.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/gfortran.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/gnulink.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/gnulink.py
index 12045352..12045352 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/gnulink.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/gnulink.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/gs.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/gs.py
index ac0247f1..ac0247f1 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/gs.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/gs.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/hpc++.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/hpc++.py
index d34f6008..d34f6008 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/hpc++.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/hpc++.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/hpcc.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/hpcc.py
index 1503c572..1503c572 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/hpcc.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/hpcc.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/hplink.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/hplink.py
index db5ff007..db5ff007 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/hplink.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/hplink.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/icc.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/icc.py
index 0accbf6f..0accbf6f 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/icc.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/icc.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/icl.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/icl.py
index ded400d0..ded400d0 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/icl.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/icl.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/ifl.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/ifl.py
index fabf8644..fabf8644 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/ifl.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/ifl.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/ifort.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/ifort.py
index 7d50c5aa..7d50c5aa 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/ifort.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/ifort.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/ilink.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/ilink.py
index 7a255a73..7a255a73 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/ilink.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/ilink.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/ilink32.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/ilink32.py
index 1af9af10..1af9af10 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/ilink32.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/ilink32.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/install.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/install.py
index 9c047100..9c047100 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/install.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/install.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/intelc.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/intelc.py
index 08f97c07..08f97c07 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/intelc.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/intelc.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/ipkg.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/ipkg.py
index 7558bd26..7558bd26 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/ipkg.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/ipkg.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/jar.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/jar.py
index 21c5ce41..21c5ce41 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/jar.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/jar.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/javac.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/javac.py
index df3c0306..df3c0306 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/javac.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/javac.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/javah.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/javah.py
index a0228840..a0228840 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/javah.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/javah.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/latex.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/latex.py
index 65ff78af..65ff78af 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/latex.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/latex.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/lex.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/lex.py
index 9344173e..9344173e 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/lex.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/lex.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/link.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/link.py
index 0210d7e1..0210d7e1 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/link.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/link.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/linkloc.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/linkloc.py
index 283eacb6..283eacb6 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/linkloc.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/linkloc.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/m4.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/m4.py
index ac59e481..ac59e481 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/m4.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/m4.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/masm.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/masm.py
index 2d02440d..2d02440d 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/masm.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/masm.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/midl.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/midl.py
index 65a4f12a..65a4f12a 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/midl.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/midl.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/mingw.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/mingw.py
index 4344bc12..4344bc12 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/mingw.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/mingw.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/mslib.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/mslib.py
index d3ed3dcf..d3ed3dcf 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/mslib.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/mslib.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/mslink.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/mslink.py
index 1d1bc089..1d1bc089 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/mslink.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/mslink.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/mssdk.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/mssdk.py
index 6b89873b..6b89873b 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/mssdk.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/mssdk.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/msvc.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/msvc.py
index 66c3e108..66c3e108 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/msvc.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/msvc.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/msvs.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/msvs.py
index e6f07e5d..e6f07e5d 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/msvs.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/msvs.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/mwcc.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/mwcc.py
index d61510ef..d61510ef 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/mwcc.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/mwcc.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/mwld.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/mwld.py
index d8816278..d8816278 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/mwld.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/mwld.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/nasm.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/nasm.py
index d759e41f..d759e41f 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/nasm.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/nasm.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/packaging/__init__.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/__init__.py
index 35029f2c..35029f2c 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/packaging/__init__.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/__init__.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/packaging/ipk.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/ipk.py
index 09fc7795..09fc7795 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/packaging/ipk.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/ipk.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/packaging/msi.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/msi.py
index 4cc80718..4cc80718 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/packaging/msi.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/msi.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/packaging/rpm.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/rpm.py
index a09457b6..a09457b6 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/packaging/rpm.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/rpm.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/packaging/src_tarbz2.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/src_tarbz2.py
index a6ea7500..a6ea7500 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/packaging/src_tarbz2.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/src_tarbz2.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/packaging/src_targz.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/src_targz.py
index 7474ea6c..7474ea6c 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/packaging/src_targz.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/src_targz.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/packaging/src_zip.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/src_zip.py
index d81f54c5..d81f54c5 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/packaging/src_zip.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/src_zip.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/packaging/tarbz2.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/tarbz2.py
index c01d7bcb..c01d7bcb 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/packaging/tarbz2.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/tarbz2.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/packaging/targz.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/targz.py
index 6a3282d5..6a3282d5 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/packaging/targz.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/targz.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/packaging/zip.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/zip.py
index 462aa47e..462aa47e 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/packaging/zip.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/packaging/zip.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/pdf.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/pdf.py
index e0221055..e0221055 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/pdf.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/pdf.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/pdflatex.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/pdflatex.py
index 203b635d..203b635d 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/pdflatex.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/pdflatex.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/pdftex.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/pdftex.py
index b31c966d..b31c966d 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/pdftex.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/pdftex.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/qt.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/qt.py
index 7ce6c99c..7ce6c99c 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/qt.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/qt.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/rmic.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/rmic.py
index 92623361..92623361 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/rmic.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/rmic.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/rpcgen.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/rpcgen.py
index 46f12097..46f12097 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/rpcgen.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/rpcgen.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/rpm.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/rpm.py
index d9a661a6..d9a661a6 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/rpm.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/rpm.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/sgiar.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sgiar.py
index b56de2b9..b56de2b9 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/sgiar.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sgiar.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/sgic++.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sgic++.py
index 45c64cf0..45c64cf0 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/sgic++.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sgic++.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/sgicc.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sgicc.py
index 27f83175..27f83175 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/sgicc.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sgicc.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/sgilink.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sgilink.py
index 7aef1fe9..7aef1fe9 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/sgilink.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sgilink.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/sunar.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sunar.py
index 30e5dd6f..30e5dd6f 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/sunar.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sunar.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/sunc++.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sunc++.py
index d127e161..d127e161 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/sunc++.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sunc++.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/suncc.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/suncc.py
index 14898c74..14898c74 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/suncc.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/suncc.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/sunf77.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sunf77.py
index 499a3a73..499a3a73 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/sunf77.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sunf77.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/sunf90.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sunf90.py
index 9fa91912..9fa91912 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/sunf90.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sunf90.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/sunf95.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sunf95.py
index 13e5ef9d..13e5ef9d 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/sunf95.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sunf95.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/sunlink.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sunlink.py
index 502008de..502008de 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/sunlink.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/sunlink.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/swig.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/swig.py
index d02bbe8c..d02bbe8c 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/swig.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/swig.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/tar.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/tar.py
index 55a405b2..55a405b2 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/tar.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/tar.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/tex.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/tex.py
index 23226db7..23226db7 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/tex.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/tex.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/textfile.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/textfile.py
index d4b1b0fb..d4b1b0fb 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/textfile.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/textfile.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/tlib.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/tlib.py
index 157c2100..157c2100 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/tlib.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/tlib.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/wix.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/wix.py
index 44b5d0f2..44b5d0f2 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/wix.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/wix.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/yacc.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/yacc.py
index 9f95bd12..9f95bd12 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/yacc.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/yacc.py
diff --git a/scons/scons-local-2.0.1/SCons/Tool/zip.py b/couchjs/scons/scons-local-2.0.1/SCons/Tool/zip.py
index 0f301470..0f301470 100644
--- a/scons/scons-local-2.0.1/SCons/Tool/zip.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Tool/zip.py
diff --git a/scons/scons-local-2.0.1/SCons/Util.py b/couchjs/scons/scons-local-2.0.1/SCons/Util.py
index 1ffbd032..1ffbd032 100644
--- a/scons/scons-local-2.0.1/SCons/Util.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Util.py
diff --git a/scons/scons-local-2.0.1/SCons/Variables/BoolVariable.py b/couchjs/scons/scons-local-2.0.1/SCons/Variables/BoolVariable.py
index f41537b5..f41537b5 100644
--- a/scons/scons-local-2.0.1/SCons/Variables/BoolVariable.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Variables/BoolVariable.py
diff --git a/scons/scons-local-2.0.1/SCons/Variables/EnumVariable.py b/couchjs/scons/scons-local-2.0.1/SCons/Variables/EnumVariable.py
index c9cdbb74..c9cdbb74 100644
--- a/scons/scons-local-2.0.1/SCons/Variables/EnumVariable.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Variables/EnumVariable.py
diff --git a/scons/scons-local-2.0.1/SCons/Variables/ListVariable.py b/couchjs/scons/scons-local-2.0.1/SCons/Variables/ListVariable.py
index 8f28706d..8f28706d 100644
--- a/scons/scons-local-2.0.1/SCons/Variables/ListVariable.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Variables/ListVariable.py
diff --git a/scons/scons-local-2.0.1/SCons/Variables/PackageVariable.py b/couchjs/scons/scons-local-2.0.1/SCons/Variables/PackageVariable.py
index c8bfeb83..c8bfeb83 100644
--- a/scons/scons-local-2.0.1/SCons/Variables/PackageVariable.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Variables/PackageVariable.py
diff --git a/scons/scons-local-2.0.1/SCons/Variables/PathVariable.py b/couchjs/scons/scons-local-2.0.1/SCons/Variables/PathVariable.py
index 0cf8cd35..0cf8cd35 100644
--- a/scons/scons-local-2.0.1/SCons/Variables/PathVariable.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Variables/PathVariable.py
diff --git a/scons/scons-local-2.0.1/SCons/Variables/__init__.py b/couchjs/scons/scons-local-2.0.1/SCons/Variables/__init__.py
index a2c42187..a2c42187 100644
--- a/scons/scons-local-2.0.1/SCons/Variables/__init__.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Variables/__init__.py
diff --git a/scons/scons-local-2.0.1/SCons/Warnings.py b/couchjs/scons/scons-local-2.0.1/SCons/Warnings.py
index 89f7ce93..89f7ce93 100644
--- a/scons/scons-local-2.0.1/SCons/Warnings.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/Warnings.py
diff --git a/scons/scons-local-2.0.1/SCons/__init__.py b/couchjs/scons/scons-local-2.0.1/SCons/__init__.py
index f6232251..f6232251 100644
--- a/scons/scons-local-2.0.1/SCons/__init__.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/__init__.py
diff --git a/scons/scons-local-2.0.1/SCons/compat/__init__.py b/couchjs/scons/scons-local-2.0.1/SCons/compat/__init__.py
index 1dc5cc56..1dc5cc56 100644
--- a/scons/scons-local-2.0.1/SCons/compat/__init__.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/compat/__init__.py
diff --git a/scons/scons-local-2.0.1/SCons/compat/_scons_builtins.py b/couchjs/scons/scons-local-2.0.1/SCons/compat/_scons_builtins.py
index 5daae958..5daae958 100644
--- a/scons/scons-local-2.0.1/SCons/compat/_scons_builtins.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/compat/_scons_builtins.py
diff --git a/scons/scons-local-2.0.1/SCons/compat/_scons_collections.py b/couchjs/scons/scons-local-2.0.1/SCons/compat/_scons_collections.py
index 8cae2683..8cae2683 100644
--- a/scons/scons-local-2.0.1/SCons/compat/_scons_collections.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/compat/_scons_collections.py
diff --git a/scons/scons-local-2.0.1/SCons/compat/_scons_dbm.py b/couchjs/scons/scons-local-2.0.1/SCons/compat/_scons_dbm.py
index 8c53b8c5..8c53b8c5 100644
--- a/scons/scons-local-2.0.1/SCons/compat/_scons_dbm.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/compat/_scons_dbm.py
diff --git a/scons/scons-local-2.0.1/SCons/compat/_scons_hashlib.py b/couchjs/scons/scons-local-2.0.1/SCons/compat/_scons_hashlib.py
index e38f6a8b..e38f6a8b 100644
--- a/scons/scons-local-2.0.1/SCons/compat/_scons_hashlib.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/compat/_scons_hashlib.py
diff --git a/scons/scons-local-2.0.1/SCons/compat/_scons_io.py b/couchjs/scons/scons-local-2.0.1/SCons/compat/_scons_io.py
index e7eb5ee7..e7eb5ee7 100644
--- a/scons/scons-local-2.0.1/SCons/compat/_scons_io.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/compat/_scons_io.py
diff --git a/scons/scons-local-2.0.1/SCons/compat/_scons_sets.py b/couchjs/scons/scons-local-2.0.1/SCons/compat/_scons_sets.py
index 0fde9941..0fde9941 100644
--- a/scons/scons-local-2.0.1/SCons/compat/_scons_sets.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/compat/_scons_sets.py
diff --git a/scons/scons-local-2.0.1/SCons/compat/_scons_subprocess.py b/couchjs/scons/scons-local-2.0.1/SCons/compat/_scons_subprocess.py
index eebe53d3..eebe53d3 100644
--- a/scons/scons-local-2.0.1/SCons/compat/_scons_subprocess.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/compat/_scons_subprocess.py
diff --git a/scons/scons-local-2.0.1/SCons/cpp.py b/couchjs/scons/scons-local-2.0.1/SCons/cpp.py
index 496d3f48..496d3f48 100644
--- a/scons/scons-local-2.0.1/SCons/cpp.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/cpp.py
diff --git a/scons/scons-local-2.0.1/SCons/dblite.py b/couchjs/scons/scons-local-2.0.1/SCons/dblite.py
index ea24e6a3..ea24e6a3 100644
--- a/scons/scons-local-2.0.1/SCons/dblite.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/dblite.py
diff --git a/scons/scons-local-2.0.1/SCons/exitfuncs.py b/couchjs/scons/scons-local-2.0.1/SCons/exitfuncs.py
index a72fe03d..a72fe03d 100644
--- a/scons/scons-local-2.0.1/SCons/exitfuncs.py
+++ b/couchjs/scons/scons-local-2.0.1/SCons/exitfuncs.py
diff --git a/scons/scons-local-2.0.1/scons-2.0.1.egg-info b/couchjs/scons/scons-local-2.0.1/scons-2.0.1.egg-info
index e5e2216e..e5e2216e 100644
--- a/scons/scons-local-2.0.1/scons-2.0.1.egg-info
+++ b/couchjs/scons/scons-local-2.0.1/scons-2.0.1.egg-info
diff --git a/scons/scons-time.py b/couchjs/scons/scons-time.py
index 36bdeb58..36bdeb58 100755
--- a/scons/scons-time.py
+++ b/couchjs/scons/scons-time.py
diff --git a/scons/scons.py b/couchjs/scons/scons.py
index bf84bf0e..bf84bf0e 100755
--- a/scons/scons.py
+++ b/couchjs/scons/scons.py
diff --git a/scons/sconsign.py b/couchjs/scons/sconsign.py
index adf3d283..adf3d283 100755
--- a/scons/sconsign.py
+++ b/couchjs/scons/sconsign.py