Merge branch 'train-2011.09.22' into dev

package.json

@@ -25,7 +25,7 @@
     , "colors" : "0.5.0"
     , "sax" : "0.2.3"
     , "mimelib-noiconv" : "0.1.3"
-    , "jwcrypto": "https://github.com/mozilla/jwcrypto/tarball/e8b4e91"
+    , "jwcrypto": "https://github.com/mozilla/jwcrypto/tarball/7504350"
   }
   , "scripts": {
     "postinstall": "./scripts/generate_ephemeral_keys.sh",