backing out changes made against a closed tree

layout/generic/nsFrameSetFrame.cpp

@@ -527,8 +527,6 @@ nsHTMLFramesetFrame::ParseRowColSpec(nsString& aSpec, PRInt32 aMaxNumValues,
   static const PRUnichar PERCENT('%');
   static const PRUnichar COMMA(',');
 
-  aSpec.Trim(" \n\r\t"); // remove leading and trailing whitespace  
-  
   // Count the commas 
   PRInt32 commaX = aSpec.Find(COMMA);
   PRInt32 count = 1;

layout/html/document/src/nsFrameSetFrame.cpp

@@ -527,8 +527,6 @@ nsHTMLFramesetFrame::ParseRowColSpec(nsString& aSpec, PRInt32 aMaxNumValues,
   static const PRUnichar PERCENT('%');
   static const PRUnichar COMMA(',');
 
-  aSpec.Trim(" \n\r\t"); // remove leading and trailing whitespace  
-  
   // Count the commas 
   PRInt32 commaX = aSpec.Find(COMMA);
   PRInt32 count = 1;

network/mimetype/mime.types

@@ -43,10 +43,6 @@ exts="rdf"                      type=text/rdf                   \
 desc="Resource Description Framework" icon=internal-gopher-text
 # XXX should this be text/xml?
 
-exts="xul"						type=text/xul					\
-desc="XML-Based User Interface Language" icon=internal-gopher-text
-# XXX whatever applies to RDF might apply to this as well
-
 exts="rtf"                      type=application/rtf            \
 desc="Rich Text Format"         icon=internal-gopher-text
 # note: text/richtext is *not the same format*