Merge remote branch 'upstream/master' into requirejs

Conflicts: demo/boot.js package.json
2011-01-27 17:41:57 +01:00 · 2011-01-27 17:41:57 +01:00 · cb67070b67
commit cb67070b67
parent c47c239137 6b0087c234
75 changed files with 9644 additions and 514 deletions
--- a/package.json
+++ b/package.json
@ -21,7 +21,11 @@
        "pilot": ">=0.1.0",
        "cockpit": ">=0.1.0",
        "teleport": ">=0.2.4",
-        "requirejs": ">=0.22.0"
+        "requirejs": ">=0.22.0",
+		"asyncjs": ">=0.0.2",
+        "jsdom": ">=0.1.23",
+        "htmlparser": ">=1.7.2",
+        "dryice": ">=0.1.0"
    },
    "licenses": [{
        "type": "MPL",