Merge backout.

js/jetpack/Handle.h

@@ -41,13 +41,13 @@
 #ifndef mozilla_jetpack_HandleParent_h
 #define mozilla_jetpack_HandleParent_h
 
+#include "mozilla/jetpack/PHandleParent.h"
+#include "mozilla/jetpack/PHandleChild.h"
+
 #include "jsapi.h"
 #include "jsobj.h"
 #include "jscntxt.h"
 
-#include "mozilla/jetpack/PHandleParent.h"
-#include "mozilla/jetpack/PHandleChild.h"
-
 namespace mozilla {
 namespace jetpack {
 

js/jetpack/JetpackActorCommon.cpp

@@ -36,12 +36,8 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "jscntxt.h"
-#include "jsapi.h"
-#include "jstl.h"
-#include "jshashtable.h"
-
 #include "base/basictypes.h"
+#include "jscntxt.h"
 
 #include "mozilla/jetpack/JetpackActorCommon.h"
 #include "mozilla/jetpack/PJetpack.h"
@@ -49,6 +45,10 @@
 #include "mozilla/jetpack/PHandleChild.h"
 #include "mozilla/jetpack/Handle.h"
 
+#include "jsapi.h"
+#include "jstl.h"
+#include "jshashtable.h"
+
 using mozilla::jetpack::JetpackActorCommon;
 using mozilla::jetpack::PHandleParent;
 using mozilla::jetpack::HandleParent;

js/jetpack/JetpackChild.cpp

@@ -35,14 +35,14 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "jscntxt.h"
-#include "jsarray.h"
-
 #include "base/basictypes.h"
+#include "jscntxt.h"
 
 #include "mozilla/jetpack/JetpackChild.h"
 #include "mozilla/jetpack/Handle.h"
 
+#include "jsarray.h"
+
 namespace mozilla {
 namespace jetpack {
 

modules/libpref/src/init/all.js

@@ -694,7 +694,7 @@ pref("network.http.redirection-limit", 20);
 
 // Enable http compression: comment this out in case of problems with 1.1
 // NOTE: support for "compress" has been disabled per bug 196406.
-pref("network.http.accept-encoding" ,"gzip, deflate");
+pref("network.http.accept-encoding" ,"gzip,deflate");
 
 pref("network.http.pipelining"      , false);
 pref("network.http.pipelining.ssl"  , false); // disable pipelining over SSL