second update
Merge branch 'master' of github.com:ohmygoddess/nodejs

Conflicts:
	watcher_spawn.js