diff --git a/mozilla/content/shared/public/nsLayoutAtoms.h b/mozilla/content/shared/public/nsLayoutAtoms.h
index 38c19bf0d09..76fc487d3b7 100644
--- a/mozilla/content/shared/public/nsLayoutAtoms.h
+++ b/mozilla/content/shared/public/nsLayoutAtoms.h
@@ -45,11 +45,15 @@ public:
   static nsIAtom* tty;
   static nsIAtom* tv;
 
+  // Alphabetical list of standard name space prefixes
+  static nsIAtom* htmlNameSpace;
+  static nsIAtom* xmlNameSpace;
+
   // Alphabetical list of frame additional child list names
   static nsIAtom* absoluteList;
+  static nsIAtom* bulletList;
   static nsIAtom* colGroupList;
   static nsIAtom* floaterList;
-  static nsIAtom* bulletList;
 };
 
 #endif /* nsLayoutAtoms_h___ */
diff --git a/mozilla/content/shared/src/nsLayoutAtoms.cpp b/mozilla/content/shared/src/nsLayoutAtoms.cpp
index feb39c517d7..9517803031f 100644
--- a/mozilla/content/shared/src/nsLayoutAtoms.cpp
+++ b/mozilla/content/shared/src/nsLayoutAtoms.cpp
@@ -19,6 +19,7 @@
 
 // XXX make this be autogenerated. doh!
 
+// media atoms
 nsIAtom* nsLayoutAtoms::all;
 nsIAtom* nsLayoutAtoms::aural;
 nsIAtom* nsLayoutAtoms::braille;
@@ -30,10 +31,16 @@ nsIAtom* nsLayoutAtoms::screen;
 nsIAtom* nsLayoutAtoms::tty;
 nsIAtom* nsLayoutAtoms::tv;
 
+// name space atoms
+nsIAtom* nsLayoutAtoms::htmlNameSpace;
+nsIAtom* nsLayoutAtoms::xmlNameSpace;
+
+// frame additional child lists
 nsIAtom* nsLayoutAtoms::absoluteList;
+nsIAtom* nsLayoutAtoms::bulletList;
 nsIAtom* nsLayoutAtoms::colGroupList;
 nsIAtom* nsLayoutAtoms::floaterList;
-nsIAtom* nsLayoutAtoms::bulletList;
+
 
 static nsrefcnt gRefCnt;
 
@@ -51,10 +58,13 @@ void nsLayoutAtoms::AddrefAtoms()
     tty = NS_NewAtom("TTY");
     tv = NS_NewAtom("TV");
 
+    htmlNameSpace = NS_NewAtom("html");
+    xmlNameSpace = NS_NewAtom("xml");
+
     absoluteList = NS_NewAtom("Absolute-list");
+    bulletList = NS_NewAtom("Bullet-list");
     colGroupList = NS_NewAtom("ColGroup-list");
     floaterList = NS_NewAtom("Floater-list");
-    bulletList = NS_NewAtom("Bullet-list");
   }
   ++gRefCnt;
 }
@@ -73,11 +83,14 @@ void nsLayoutAtoms::ReleaseAtoms()
     NS_RELEASE(screen);
     NS_RELEASE(tty);
     NS_RELEASE(tv);
+    
+    NS_RELEASE(htmlNameSpace);
+    NS_RELEASE(xmlNameSpace);
 
     NS_RELEASE(absoluteList);
+    NS_RELEASE(bulletList);
     NS_RELEASE(colGroupList);
     NS_RELEASE(floaterList);
-    NS_RELEASE(bulletList);
   }
 }
 
diff --git a/mozilla/layout/base/nsLayoutAtoms.cpp b/mozilla/layout/base/nsLayoutAtoms.cpp
index feb39c517d7..9517803031f 100644
--- a/mozilla/layout/base/nsLayoutAtoms.cpp
+++ b/mozilla/layout/base/nsLayoutAtoms.cpp
@@ -19,6 +19,7 @@
 
 // XXX make this be autogenerated. doh!
 
+// media atoms
 nsIAtom* nsLayoutAtoms::all;
 nsIAtom* nsLayoutAtoms::aural;
 nsIAtom* nsLayoutAtoms::braille;
@@ -30,10 +31,16 @@ nsIAtom* nsLayoutAtoms::screen;
 nsIAtom* nsLayoutAtoms::tty;
 nsIAtom* nsLayoutAtoms::tv;
 
+// name space atoms
+nsIAtom* nsLayoutAtoms::htmlNameSpace;
+nsIAtom* nsLayoutAtoms::xmlNameSpace;
+
+// frame additional child lists
 nsIAtom* nsLayoutAtoms::absoluteList;
+nsIAtom* nsLayoutAtoms::bulletList;
 nsIAtom* nsLayoutAtoms::colGroupList;
 nsIAtom* nsLayoutAtoms::floaterList;
-nsIAtom* nsLayoutAtoms::bulletList;
+
 
 static nsrefcnt gRefCnt;
 
@@ -51,10 +58,13 @@ void nsLayoutAtoms::AddrefAtoms()
     tty = NS_NewAtom("TTY");
     tv = NS_NewAtom("TV");
 
+    htmlNameSpace = NS_NewAtom("html");
+    xmlNameSpace = NS_NewAtom("xml");
+
     absoluteList = NS_NewAtom("Absolute-list");
+    bulletList = NS_NewAtom("Bullet-list");
     colGroupList = NS_NewAtom("ColGroup-list");
     floaterList = NS_NewAtom("Floater-list");
-    bulletList = NS_NewAtom("Bullet-list");
   }
   ++gRefCnt;
 }
@@ -73,11 +83,14 @@ void nsLayoutAtoms::ReleaseAtoms()
     NS_RELEASE(screen);
     NS_RELEASE(tty);
     NS_RELEASE(tv);
+    
+    NS_RELEASE(htmlNameSpace);
+    NS_RELEASE(xmlNameSpace);
 
     NS_RELEASE(absoluteList);
+    NS_RELEASE(bulletList);
     NS_RELEASE(colGroupList);
     NS_RELEASE(floaterList);
-    NS_RELEASE(bulletList);
   }
 }
 
diff --git a/mozilla/layout/base/nsLayoutAtoms.h b/mozilla/layout/base/nsLayoutAtoms.h
index 38c19bf0d09..76fc487d3b7 100644
--- a/mozilla/layout/base/nsLayoutAtoms.h
+++ b/mozilla/layout/base/nsLayoutAtoms.h
@@ -45,11 +45,15 @@ public:
   static nsIAtom* tty;
   static nsIAtom* tv;
 
+  // Alphabetical list of standard name space prefixes
+  static nsIAtom* htmlNameSpace;
+  static nsIAtom* xmlNameSpace;
+
   // Alphabetical list of frame additional child list names
   static nsIAtom* absoluteList;
+  static nsIAtom* bulletList;
   static nsIAtom* colGroupList;
   static nsIAtom* floaterList;
-  static nsIAtom* bulletList;
 };
 
 #endif /* nsLayoutAtoms_h___ */
diff --git a/mozilla/layout/base/public/nsLayoutAtoms.h b/mozilla/layout/base/public/nsLayoutAtoms.h
index 38c19bf0d09..76fc487d3b7 100644
--- a/mozilla/layout/base/public/nsLayoutAtoms.h
+++ b/mozilla/layout/base/public/nsLayoutAtoms.h
@@ -45,11 +45,15 @@ public:
   static nsIAtom* tty;
   static nsIAtom* tv;
 
+  // Alphabetical list of standard name space prefixes
+  static nsIAtom* htmlNameSpace;
+  static nsIAtom* xmlNameSpace;
+
   // Alphabetical list of frame additional child list names
   static nsIAtom* absoluteList;
+  static nsIAtom* bulletList;
   static nsIAtom* colGroupList;
   static nsIAtom* floaterList;
-  static nsIAtom* bulletList;
 };
 
 #endif /* nsLayoutAtoms_h___ */
diff --git a/mozilla/layout/base/src/nsLayoutAtoms.cpp b/mozilla/layout/base/src/nsLayoutAtoms.cpp
index feb39c517d7..9517803031f 100644
--- a/mozilla/layout/base/src/nsLayoutAtoms.cpp
+++ b/mozilla/layout/base/src/nsLayoutAtoms.cpp
@@ -19,6 +19,7 @@
 
 // XXX make this be autogenerated. doh!
 
+// media atoms
 nsIAtom* nsLayoutAtoms::all;
 nsIAtom* nsLayoutAtoms::aural;
 nsIAtom* nsLayoutAtoms::braille;
@@ -30,10 +31,16 @@ nsIAtom* nsLayoutAtoms::screen;
 nsIAtom* nsLayoutAtoms::tty;
 nsIAtom* nsLayoutAtoms::tv;
 
+// name space atoms
+nsIAtom* nsLayoutAtoms::htmlNameSpace;
+nsIAtom* nsLayoutAtoms::xmlNameSpace;
+
+// frame additional child lists
 nsIAtom* nsLayoutAtoms::absoluteList;
+nsIAtom* nsLayoutAtoms::bulletList;
 nsIAtom* nsLayoutAtoms::colGroupList;
 nsIAtom* nsLayoutAtoms::floaterList;
-nsIAtom* nsLayoutAtoms::bulletList;
+
 
 static nsrefcnt gRefCnt;
 
@@ -51,10 +58,13 @@ void nsLayoutAtoms::AddrefAtoms()
     tty = NS_NewAtom("TTY");
     tv = NS_NewAtom("TV");
 
+    htmlNameSpace = NS_NewAtom("html");
+    xmlNameSpace = NS_NewAtom("xml");
+
     absoluteList = NS_NewAtom("Absolute-list");
+    bulletList = NS_NewAtom("Bullet-list");
     colGroupList = NS_NewAtom("ColGroup-list");
     floaterList = NS_NewAtom("Floater-list");
-    bulletList = NS_NewAtom("Bullet-list");
   }
   ++gRefCnt;
 }
@@ -73,11 +83,14 @@ void nsLayoutAtoms::ReleaseAtoms()
     NS_RELEASE(screen);
     NS_RELEASE(tty);
     NS_RELEASE(tv);
+    
+    NS_RELEASE(htmlNameSpace);
+    NS_RELEASE(xmlNameSpace);
 
     NS_RELEASE(absoluteList);
+    NS_RELEASE(bulletList);
     NS_RELEASE(colGroupList);
     NS_RELEASE(floaterList);
-    NS_RELEASE(bulletList);
   }
 }