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

Conflicts:
	AUTHORS
	ChangeLog
	LICENSE
	Makefile
	deps/http_parser/test.c
	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/lib/npm.js
	deps/npm/man/man1/npm.1
	deps/npm/man/man3/npm.3
	deps/npm/node_modules/fstream-npm/fstream-npm.js
	deps/npm/node_modules/fstream-npm/node_modules/fstream-ignore/package.json
	deps/npm/node_modules/fstream-npm/package.json
	deps/npm/node_modules/node-gyp/LICENSE
	deps/npm/node_modules/node-gyp/lib/build.js
	deps/npm/node_modules/node-gyp/lib/install.js
	deps/npm/node_modules/node-gyp/node_modules/ansi/package.json
	deps/npm/node_modules/node-gyp/node_modules/glob/package.json
	deps/npm/node_modules/node-gyp/package.json
	deps/npm/package.json
	deps/uv/test/test-fs.c
	deps/v8/src/regexp-macro-assembler-tracer.cc
	deps/v8/src/version.cc
	src/node_version.h
	src/platform_sunos.cc
	test/simple/test-net-write-after-close.js
	wscript

5 files changed, 9 insertions, 12 deletions

diff --git a/doc/community/index.html b/doc/community/index.html
index 7087f795f8..13f73230b0 100644
--- a/doc/community/index.html
+++ b/doc/community/index.html
@@ -134,7 +134,7 @@
                           <br>
                           <a href="http://nodejs.ir">nodejs.ir</a> Iran group in Persian
                           <br>
-                          <a href="http://nodejs.jp/">nodejs.jp</a> Japan user group 
+                          <a href="http://nodejs.jp/">nodejs.jp</a> Japan user group
                           <br>
                           <a href="http://cnodejs.org">CNodeJS.org</a> Chinese community
                           <br>
@@ -142,7 +142,13 @@
                           <br>
                           <a href="http://nodejs.hk">HKNoJ</a> Hong Kong community
                           <br>
-                          <a href="http://nodejs.tw">nodejs.tw</a> Taiwan community</p>
+                          <a href="http://nodejs.tw">nodejs.tw</a> Taiwan community
+                          <br>
+                          <a href="http://nodehispano.com">Node Hispano</a> Spanish language community
+                          <br>
+                          <a href="http://nodejskr.org">OctoberSkyJs</a> Korea Node.js community
+                        </p>
+
                   </div>
               </div>
 
diff --git a/doc/images/linkedin-logo.png b/doc/images/linkedin-logo.png
index 2ad9fb2c0c..1c79cf4acd 100644
--- a/doc/images/linkedin-logo.png
+++ b/doc/images/linkedin-logo.png
diff --git a/doc/images/microsoft-logo.png b/doc/images/microsoft-logo.png
index 6dac0f39b6..1a58d10762 100644
--- a/doc/images/microsoft-logo.png
+++ b/doc/images/microsoft-logo.png
diff --git a/doc/images/yahoo-logo.png b/doc/images/yahoo-logo.png
index 05d75b3513..689d21b71e 100644
--- a/doc/images/yahoo-logo.png
+++ b/doc/images/yahoo-logo.png
diff --git a/doc/pipe.css b/doc/pipe.css
index fa8b44c23d..5c1ce79b0e 100644
--- a/doc/pipe.css
+++ b/doc/pipe.css
@@ -150,16 +150,7 @@ h1 a, h2 a, h3 a, h4 a
     font-size: 11px;
 }
 
-#quotes ul li.ebay {
-    margin-top: -10px;
-}
-
-#quotes ul li.linkedin {
-    margin-top: -4px;
-}
-
-#quotes ul li.yahoo {
-    margin-top: -4px;
+#quotes ul li:last-child {
     padding-right: 0;
 }