diff --git a/mozilla/js/rhino/src/org/mozilla/classfile/ClassFileWriter.java b/mozilla/js/rhino/src/org/mozilla/classfile/ClassFileWriter.java
index 106f2be9802..59c753cafa5 100644
--- a/mozilla/js/rhino/src/org/mozilla/classfile/ClassFileWriter.java
+++ b/mozilla/js/rhino/src/org/mozilla/classfile/ClassFileWriter.java
@@ -120,17 +120,17 @@ public class ClassFileWriter {
         itsFlags = flags;
     }
 
-    static String getSlashedForm(String name) 
+    static String getSlashedForm(String name)
     {
         return name.replace('.', '/');
     }
-    
-    /** 
+
+    /**
      * Convert Java class name in dot notation into
      * "Lname-with-dots-replaced-by-slashes;" form suitable for use as
      * JVM type signatures.
      */
-    public String classNameToSignature(String name) 
+    public String classNameToSignature(String name)
     {
         int nameLength = name.length();
         int colonPos = 1 + nameLength;
@@ -145,7 +145,7 @@ public class ClassFileWriter {
         }
         return new String(buf, 0, colonPos + 1);
     }
-    
+
     /**
      * Add a field to the class.
      *
@@ -1240,7 +1240,7 @@ public class ClassFileWriter {
         return putInt32((int)value, array, offset);
     }
 
-    private static void badStack(int value) 
+    private static void badStack(int value)
     {
         String s;
         if (value < 0) { s = "Stack underflow: "+value; }
@@ -1381,7 +1381,7 @@ public class ClassFileWriter {
     /**
      * Number of operands accompanying the opcode.
      */
-    static int opcodeCount(int opcode) 
+    static int opcodeCount(int opcode)
     {
         switch (opcode) {
             case ByteCode.AALOAD:
@@ -1601,7 +1601,7 @@ public class ClassFileWriter {
     /**
      *  The effect on the operand stack of a given opcode.
      */
-    static int stackChange(int opcode) 
+    static int stackChange(int opcode)
     {
         // For INVOKE... accounts only for popping this (unless static),
         // ignoring parameters and return type
@@ -1832,7 +1832,7 @@ public class ClassFileWriter {
          * Not in use currently.
          */
 /*
-    int extra(int opcode) 
+    int extra(int opcode)
     {
         switch (opcode) {
             case ByteCode.AALOAD:
@@ -2267,8 +2267,8 @@ public class ClassFileWriter {
         }
         return "";
     }
-    
-    final char[] getCharBuffer(int minimalSize) 
+
+    final char[] getCharBuffer(int minimalSize)
     {
         if (minimalSize > tmpCharBuffer.length) {
             int newSize = tmpCharBuffer.length * 2;
@@ -2749,7 +2749,7 @@ final class ConstantPool
     }
 
     private ClassFileWriter cfw;
-    
+
     private static final int MAX_UTF_ENCODING_SIZE = 65535;
 
     private UintMap itsStringConstHash = new UintMap();
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/IRFactory.java b/mozilla/js/rhino/src/org/mozilla/javascript/IRFactory.java
index e881cc40957..7738736b934 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/IRFactory.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/IRFactory.java
@@ -710,7 +710,7 @@ public class IRFactory {
                 return new Node(Token.TRUE);
             }
             return new Node(nodeType, left, right);
-        
+
         } else if (nodeType == Token.TYPEOF) {
             if (childNode.getType() == Token.NAME) {
                 childNode.setType(Token.TYPEOFNAME);
@@ -720,12 +720,12 @@ public class IRFactory {
         return new Node(nodeType, childNode);
     }
 
-    public Object createIncDec(int nodeType, boolean post, Object child) 
+    public Object createIncDec(int nodeType, boolean post, Object child)
     {
         Node childNode = (Node)child;
         int childType = childNode.getType();
 
-        if (post && !hasSideEffects(childNode) 
+        if (post && !hasSideEffects(childNode)
             && (childType == Token.NAME
                 || childType == Token.GETPROP
                 || childType == Token.GETELEM))
@@ -756,11 +756,11 @@ public class IRFactory {
     /**
      * Binary
      */
-    public Object createBinary(int nodeType, Object leftObj, Object rightObj) 
+    public Object createBinary(int nodeType, Object leftObj, Object rightObj)
     {
         Node left = (Node)leftObj;
         Node right = (Node)rightObj;
-        
+
         switch (nodeType) {
 
           case Token.DOT:
@@ -835,7 +835,7 @@ public class IRFactory {
         Node opLeft = Node.newString(Token.NAME, s);
         if (tonumber)
             opLeft = new Node(Token.POS, opLeft);
-        
+
         if (!postfix) {
             Node op = new Node(assignOp, opLeft, right);
             Node lvalueLeft = Node.newString(Token.BINDNAME, s);
@@ -860,7 +860,7 @@ public class IRFactory {
         return new Node(Token.NEWTEMP, n);
     }
 
-    public Node createUseTemp(Node newTemp) 
+    public Node createUseTemp(Node newTemp)
     {
         switch (newTemp.getType()) {
           case Token.NEWTEMP: {
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
index c190102995b..d0ed44dddd3 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
@@ -1638,7 +1638,7 @@ public class ScriptRuntime {
      *
      * @return a instanceof b
      */
-    public static boolean instanceOf(Object a, Object b, Scriptable scope) 
+    public static boolean instanceOf(Object a, Object b, Scriptable scope)
     {
         // Check RHS is an object
         if (! (b instanceof Scriptable)) {