Merge branch 'v0.4'

Conflicts:
	src/node.js
	src/node_version.h

2 files changed, 2 insertions, 6 deletions

diff --git a/lib/http.js b/lib/http.js
index 7a74fdb926..0927a862d6 100644
--- a/lib/http.js
+++ b/lib/http.js
@@ -284,6 +284,7 @@ IncomingMessage.prototype._addHeaderLine = function(field, value) {
     case 'connection':
     case 'cookie':
     case 'pragma':
+    case 'link':
       if (field in dest) {
         dest[field] += ', ' + value;
       } else {
diff --git a/lib/module.js b/lib/module.js
index be5475f9cf..daf73d96f5 100644
--- a/lib/module.js
+++ b/lib/module.js
@@ -199,12 +199,7 @@ Module._nodeModulePaths = function(from) {
   var paths = [];
   var parts = from.split(splitRe);
 
-  var root = parts.indexOf('node_modules') - 1;
-  if (root < 0) root = 0;
-
-  var tip = parts.length - 1;
-
-  for (var tip = parts.length - 1; tip >= root; tip --) {
+  for (var tip = parts.length - 1; tip >= 0; tip --) {
     // don't search in .../node_modules/node_modules
     if (parts[tip] === 'node_modules') continue;
     var dir = parts.slice(0, tip + 1).concat('node_modules').join(joiner);