Back out patch from bug 407275 on the trunk now that Firefox 3 Beta 2 has branched.

browser/base/content/browser.xul

@@ -64,8 +64,8 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="BrowserStartup()" onunload="BrowserShutdown()" onclose="return WindowIsClosing();"
         contenttitlesetting="true"
-        title="&mainWindow.title; 3 Beta 2"
+        title="&mainWindow.title;"
-        titlemodifier="&mainWindow.title; 3 Beta 2"
+        titlemodifier="&mainWindow.title;"
         titlemenuseparator="&mainWindow.titlemodifiermenuseparator;"
         windowtype="navigator:browser"
         screenX="4" screenY="4"

other-licenses/branding/firefox/branding.nsi

@@ -47,10 +47,9 @@
 !define SurveyURL             "https://survey.mozilla.com/1/Mozilla%20Firefox/${AppVersion}/${AB_CD}/exit.html"
 
 # Everything below this line may be modified for Alpha / Beta releases.
-!define BrandFullName         "Mozilla Firefox 3 Beta 2"
+!define BrandFullName         "Mozilla Firefox"
 
 # Add !define NO_INSTDIR_FROM_REG to prevent finding a non-default installation
 # directory in the registry and using that as the default. This prevents
 # Beta releases built with official branding from finding an existing install
 # of an official release and defaulting to its installation directory.
-!define NO_INSTDIR_FROM_REG