Merge commit 'kriskowal/integration'

package.json

@@ -1,5 +1,5 @@
-// ServerJS package specification.
 {
+  "!": "This is a Narwhal package descriptor.", 
   "name": "underscore",
   "description": "Functional programming aid for Javascript. Works well with jQuery.",
   "url": "http://documentcloud.github.com/underscore/",
@@ -8,5 +8,5 @@
   "maintainer": "Kris Kowal <kris.kowal@cixar.com>",
   "contributors": [],
   "dependencies": [],
-  "lib", "."
+  "lib": "."
 }

underscore.js

@@ -31,7 +31,7 @@
         obj.each(function(value) { iterator.call(context, value, index++); });
       } else {
         var i = 0;
-        for (var key in obj) if (obj.hasOwnProperty(key)) {
+        for (var key in obj) if (Object.prototype.hasOwnProperty.call(obj, key)) {
           var value = obj[key], pair = [key, value];
           pair.key = key;
           pair.value = value;