Landing the Aviary Branch (Toolkit sections excluding toolkit/content).

toolkit/components/passwordmgr/content/passwordManager.js

@@ -323,9 +323,9 @@ var rejectsTreeView = {
   isSorted: function() { return false; },
   isContainer : function(index) {return false;},
   cycleHeader : function(column) {},
-  getRowProperties : function(row,prop) {},
-  getColumnProperties : function(column,prop) {},
-  getCellProperties : function(row,column,prop) {}
+  getRowProperties : function(row,prop){},
+  getColumnProperties : function(column,prop){},
+  getCellProperties : function(row,column,prop){}
  };
 var rejectsTree;
 

toolkit/components/passwordmgr/jar.mn

@@ -2,8 +2,3 @@ toolkit.jar:
     content/passwordmgr/contents.rdf        (content/contents.rdf)
 *   content/passwordmgr/passwordManager.xul (content/passwordManager.xul)
 *   content/passwordmgr/passwordManager.js  (content/passwordManager.js)
-
-en-US.jar:
-    locale/en-US/passwordmgr/contents.rdf            (locale/contents.rdf)
-*   locale/en-US/passwordmgr/passwordmgr.properties  (locale/passwordmgr.properties)
-*   locale/en-US/passwordmgr/passwordManager.dtd     (locale/passwordManager.dtd)