Merge remote-tracking branch 'ry/v0.6' into v0.6-merge

Conflicts:
	ChangeLog
	Makefile
	deps/npm/AUTHORS
	deps/npm/html/api/bin.html
	deps/npm/html/api/bugs.html
	deps/npm/html/api/commands.html
	deps/npm/html/api/config.html
	deps/npm/html/api/deprecate.html
	deps/npm/html/api/docs.html
	deps/npm/html/api/edit.html
	deps/npm/html/api/explore.html
	deps/npm/html/api/help-search.html
	deps/npm/html/api/init.html
	deps/npm/html/api/install.html
	deps/npm/html/api/link.html
	deps/npm/html/api/load.html
	deps/npm/html/api/ls.html
	deps/npm/html/api/npm.html
	deps/npm/html/api/outdated.html
	deps/npm/html/api/owner.html
	deps/npm/html/api/pack.html
	deps/npm/html/api/prefix.html
	deps/npm/html/api/prune.html
	deps/npm/html/api/publish.html
	deps/npm/html/api/rebuild.html
	deps/npm/html/api/restart.html
	deps/npm/html/api/root.html
	deps/npm/html/api/run-script.html
	deps/npm/html/api/search.html
	deps/npm/html/api/shrinkwrap.html
	deps/npm/html/api/start.html
	deps/npm/html/api/stop.html
	deps/npm/html/api/submodule.html
	deps/npm/html/api/tag.html
	deps/npm/html/api/test.html
	deps/npm/html/api/uninstall.html
	deps/npm/html/api/unpublish.html
	deps/npm/html/api/update.html
	deps/npm/html/api/version.html
	deps/npm/html/api/view.html
	deps/npm/html/api/whoami.html
	deps/npm/html/doc/README.html
	deps/npm/html/doc/adduser.html
	deps/npm/html/doc/bin.html
	deps/npm/html/doc/bugs.html
	deps/npm/html/doc/build.html
	deps/npm/html/doc/bundle.html
	deps/npm/html/doc/cache.html
	deps/npm/html/doc/changelog.html
	deps/npm/html/doc/coding-style.html
	deps/npm/html/doc/completion.html
	deps/npm/html/doc/config.html
	deps/npm/html/doc/deprecate.html
	deps/npm/html/doc/developers.html
	deps/npm/html/doc/disputes.html
	deps/npm/html/doc/docs.html
	deps/npm/html/doc/edit.html
	deps/npm/html/doc/explore.html
	deps/npm/html/doc/faq.html
	deps/npm/html/doc/folders.html
	deps/npm/html/doc/help-search.html
	deps/npm/html/doc/help.html
	deps/npm/html/doc/index.html
	deps/npm/html/doc/init.html
	deps/npm/html/doc/install.html
	deps/npm/html/doc/json.html
	deps/npm/html/doc/link.html
	deps/npm/html/doc/list.html
	deps/npm/html/doc/npm.html
	deps/npm/html/doc/outdated.html
	deps/npm/html/doc/owner.html
	deps/npm/html/doc/pack.html
	deps/npm/html/doc/prefix.html
	deps/npm/html/doc/prune.html
	deps/npm/html/doc/publish.html
	deps/npm/html/doc/rebuild.html
	deps/npm/html/doc/registry.html
	deps/npm/html/doc/removing-npm.html
	deps/npm/html/doc/restart.html
	deps/npm/html/doc/root.html
	deps/npm/html/doc/run-script.html
	deps/npm/html/doc/scripts.html
	deps/npm/html/doc/search.html
	deps/npm/html/doc/semver.html
	deps/npm/html/doc/shrinkwrap.html
	deps/npm/html/doc/star.html
	deps/npm/html/doc/start.html
	deps/npm/html/doc/stop.html
	deps/npm/html/doc/submodule.html
	deps/npm/html/doc/tag.html
	deps/npm/html/doc/test.html
	deps/npm/html/doc/uninstall.html
	deps/npm/html/doc/unpublish.html
	deps/npm/html/doc/update.html
	deps/npm/html/doc/version.html
	deps/npm/html/doc/view.html
	deps/npm/html/doc/whoami.html
	deps/npm/man/man1/npm.1
	deps/npm/man/man3/npm.3
	deps/npm/package.json
	doc/api/url.markdown
	lib/http.js
	src/node_version.h
	test/simple/test-fs-sync-fd-leak.js

4 files changed, 14 insertions, 14 deletions

diff --git a/deps/npm/test/packages/npm-test-env-reader/package.json b/deps/npm/test/packages/npm-test-env-reader/package.json
index 99d7fc9307..ddd5c91abd 100644
--- a/deps/npm/test/packages/npm-test-env-reader/package.json
+++ b/deps/npm/test/packages/npm-test-env-reader/package.json
@@ -1,14 +1,14 @@
 { "name":"npm-test-env-reader"
 , "version" : "1.2.3"
 , "scripts" :
-  { "install"       : "node test.js"
-  , "preinstall"    : "node test.js"
-  , "preuninstall"  : "node test.js"
-  , "postuninstall" : "node test.js"
-  , "test"          : "node test.js"
-  , "stop"          : "node test.js"
-  , "start"         : "node test.js"
-  , "restart"       : "node test.js"
-  , "foo"           : "node test.js"
+  { "install"       : "./test.sh"
+  , "preinstall"    : "./test.sh"
+  , "preuninstall"  : "./test.sh"
+  , "postuninstall" : "./test.sh"
+  , "test"          : "./test.sh"
+  , "stop"          : "./test.sh"
+  , "start"         : "./test.sh"
+  , "restart"       : "./test.sh"
+  , "foo"           : "./test.sh"
   }
 }
diff --git a/deps/npm/test/packages/npm-test-env-reader/test.sh b/deps/npm/test/packages/npm-test-env-reader/test.sh
new file mode 100755
index 0000000000..b4ca4374ed
--- /dev/null
+++ b/deps/npm/test/packages/npm-test-env-reader/test.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env sh
+env | grep npm | sort | uniq
+echo PATH=$PATH
diff --git a/deps/npm/test/packages/npm-test-files/package.json b/deps/npm/test/packages/npm-test-files/package.json
index 2afa12dc56..7c067828e2 100644
--- a/deps/npm/test/packages/npm-test-files/package.json
+++ b/deps/npm/test/packages/npm-test-files/package.json
@@ -5,6 +5,5 @@
   , "sub/include"
   , "sub/include2"
   , "sub/include4"
-  , "test.sh"
-  , ".npmignore" ]
+  , "test.sh" ]
 , "scripts":{"test":"bash test.sh"}}
diff --git a/deps/npm/test/packages/npm-test-optional-deps/package.json b/deps/npm/test/packages/npm-test-optional-deps/package.json
index 56c6f09ed0..ebcd56832d 100644
--- a/deps/npm/test/packages/npm-test-optional-deps/package.json
+++ b/deps/npm/test/packages/npm-test-optional-deps/package.json
@@ -1,12 +1,10 @@
 { "name": "npm-test-optional-deps"
 , "version": "1.2.5"
-, "scripts": { "test": "node test.js" }
 , "optionalDependencies":
   { "npm-test-foobarzaaakakaka": "http://example.com/"
   , "dnode": "10.999.14234"
-  , "sax": "0.3.5"
+  , "sax": "*"
   , "999 invalid name": "1.2.3"
   , "glob": "some invalid version 99 #! $$ x y z"
-  , "npm-test-failer":"*"
   }
 }