diff --git a/camino/Camino.xcodeproj/project.pbxproj b/camino/Camino.xcodeproj/project.pbxproj
index dbbef645cac..81ae77be7c9 100644
--- a/camino/Camino.xcodeproj/project.pbxproj
+++ b/camino/Camino.xcodeproj/project.pbxproj
@@ -1207,6 +1207,14 @@
 		82CE28C0073661F600B4DE07 /* EditorOverride.css in Copy Gecko Resources */ = {isa = PBXBuildFile; fileRef = 82CE28BD073661E300B4DE07 /* EditorOverride.css */; };
 		82CE28C7073662B400B4DE07 /* composer.xpt in Copy Component XPTs */ = {isa = PBXBuildFile; fileRef = 82CE28C40736625800B4DE07 /* composer.xpt */; };
 		82CE28CB0736634A00B4DE07 /* txmgr.xpt in Copy Component XPTs */ = {isa = PBXBuildFile; fileRef = 82CE28C80736633900B4DE07 /* txmgr.xpt */; };
+		C79573880D35314D0028A773 /* XMLSearchPluginParser.mm in Sources */ = {isa = PBXBuildFile; fileRef = C79573840D35314D0028A773 /* XMLSearchPluginParser.mm */; };
+		C79573890D35314D0028A773 /* XMLSearchPluginParser.h in Headers */ = {isa = PBXBuildFile; fileRef = C79573850D35314D0028A773 /* XMLSearchPluginParser.h */; };
+		C795738A0D35314D0028A773 /* OpenSearchParser.mm in Sources */ = {isa = PBXBuildFile; fileRef = C79573860D35314D0028A773 /* OpenSearchParser.mm */; };
+		C795738B0D35314D0028A773 /* OpenSearchParser.h in Headers */ = {isa = PBXBuildFile; fileRef = C79573870D35314D0028A773 /* OpenSearchParser.h */; };
+		C795738C0D35314D0028A773 /* XMLSearchPluginParser.mm in Sources */ = {isa = PBXBuildFile; fileRef = C79573840D35314D0028A773 /* XMLSearchPluginParser.mm */; };
+		C795738D0D35314D0028A773 /* XMLSearchPluginParser.h in Headers */ = {isa = PBXBuildFile; fileRef = C79573850D35314D0028A773 /* XMLSearchPluginParser.h */; };
+		C795738E0D35314D0028A773 /* OpenSearchParser.mm in Sources */ = {isa = PBXBuildFile; fileRef = C79573860D35314D0028A773 /* OpenSearchParser.mm */; };
+		C795738F0D35314D0028A773 /* OpenSearchParser.h in Headers */ = {isa = PBXBuildFile; fileRef = C79573870D35314D0028A773 /* OpenSearchParser.h */; };
 		C7FF536C0D35281F00194776 /* search_editor_bottom_background.png in Resources */ = {isa = PBXBuildFile; fileRef = C7FF536A0D35281F00194776 /* search_editor_bottom_background.png */; };
 		C7FF536D0D35281F00194776 /* search_editor_action.png in Resources */ = {isa = PBXBuildFile; fileRef = C7FF536B0D35281F00194776 /* search_editor_action.png */; };
 		C7FF536E0D35281F00194776 /* search_editor_bottom_background.png in Resources */ = {isa = PBXBuildFile; fileRef = C7FF536A0D35281F00194776 /* search_editor_bottom_background.png */; };
@@ -2671,6 +2679,10 @@
 		A7D88E6A0465D9F800A80196 /* suitetypeaheadfind.xpt */ = {isa = PBXFileReference; lastKnownFileType = file; name = suitetypeaheadfind.xpt; path = ../extensions/typeaheadfind/public/_xpidlgen/suitetypeaheadfind.xpt; sourceTree = SOURCE_ROOT; };
 		A7E5D960041A07C900A967F8 /* libi18n.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libi18n.a; path = ../intl/build/libi18n.a; sourceTree = SOURCE_ROOT; };
 		A7FD31C90466004E00A80196 /* libsuitetypeaheadfind.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsuitetypeaheadfind.a; path = ../extensions/typeaheadfind/src/libsuitetypeaheadfind.a; sourceTree = SOURCE_ROOT; };
+		C79573840D35314D0028A773 /* XMLSearchPluginParser.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = XMLSearchPluginParser.mm; path = src/websearch/XMLSearchPluginParser.mm; sourceTree = "<group>"; };
+		C79573850D35314D0028A773 /* XMLSearchPluginParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XMLSearchPluginParser.h; path = src/websearch/XMLSearchPluginParser.h; sourceTree = "<group>"; };
+		C79573860D35314D0028A773 /* OpenSearchParser.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = OpenSearchParser.mm; path = src/websearch/OpenSearchParser.mm; sourceTree = "<group>"; };
+		C79573870D35314D0028A773 /* OpenSearchParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OpenSearchParser.h; path = src/websearch/OpenSearchParser.h; sourceTree = "<group>"; };
 		C7FF536A0D35281F00194776 /* search_editor_bottom_background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = search_editor_bottom_background.png; path = chrome/search_editor_bottom_background.png; sourceTree = "<group>"; };
 		C7FF536B0D35281F00194776 /* search_editor_action.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = search_editor_action.png; path = chrome/search_editor_action.png; sourceTree = "<group>"; };
 		C7FF53710D35285400194776 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = resources/localized/English.lproj/SearchEngineEditor.nib; sourceTree = "<group>"; };
@@ -3909,16 +3921,44 @@
 			name = Midas;
 			sourceTree = "<group>";
 		};
-		C7FF53690D3527F400194776 /* Web Search */ = {
+		C795737B0D35310B0028A773 /* Backend */ = {
 			isa = PBXGroup;
 			children = (
 				C7FF537A0D3528B700194776 /* SearchEngineManager.h */,
 				C7FF53790D3528B700194776 /* SearchEngineManager.mm */,
+			);
+			name = Backend;
+			sourceTree = "<group>";
+		};
+		C795737C0D3531100028A773 /* Plug-ins */ = {
+			isa = PBXGroup;
+			children = (
+				C79573870D35314D0028A773 /* OpenSearchParser.h */,
+				C79573860D35314D0028A773 /* OpenSearchParser.mm */,
+				C79573850D35314D0028A773 /* XMLSearchPluginParser.h */,
+				C79573840D35314D0028A773 /* XMLSearchPluginParser.mm */,
+			);
+			name = "Plug-ins";
+			sourceTree = "<group>";
+		};
+		C795737E0D35311B0028A773 /* UI */ = {
+			isa = PBXGroup;
+			children = (
 				C7FF537C0D3528B700194776 /* SearchEngineEditor.h */,
 				C7FF537B0D3528B700194776 /* SearchEngineEditor.mm */,
 				00335B8B0C655ABC00A607F2 /* WebSearchField.h */,
 				00335B8C0C655ABC00A607F2 /* WebSearchField.mm */,
 			);
+			name = UI;
+			sourceTree = "<group>";
+		};
+		C7FF53690D3527F400194776 /* Web Search */ = {
+			isa = PBXGroup;
+			children = (
+				C795737B0D35310B0028A773 /* Backend */,
+				C795737E0D35311B0028A773 /* UI */,
+				C795737C0D3531100028A773 /* Plug-ins */,
+			);
 			name = "Web Search";
 			sourceTree = "<group>";
 		};
@@ -4818,6 +4858,8 @@
 				33E95A770D31B6FA0054C01D /* CHCookieStorage.h in Headers */,
 				C7FF537E0D3528B700194776 /* SearchEngineManager.h in Headers */,
 				C7FF53800D3528B700194776 /* SearchEngineEditor.h in Headers */,
+				C79573890D35314D0028A773 /* XMLSearchPluginParser.h in Headers */,
+				C795738B0D35314D0028A773 /* OpenSearchParser.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -4994,6 +5036,8 @@
 				33E95A790D31B6FA0054C01D /* CHCookieStorage.h in Headers */,
 				C7FF53820D3528B700194776 /* SearchEngineManager.h in Headers */,
 				C7FF53840D3528B700194776 /* SearchEngineEditor.h in Headers */,
+				C795738D0D35314D0028A773 /* XMLSearchPluginParser.h in Headers */,
+				C795738F0D35314D0028A773 /* OpenSearchParser.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -5854,6 +5898,8 @@
 				33E95A780D31B6FA0054C01D /* CHCookieStorage.mm in Sources */,
 				C7FF537D0D3528B700194776 /* SearchEngineManager.mm in Sources */,
 				C7FF537F0D3528B700194776 /* SearchEngineEditor.mm in Sources */,
+				C79573880D35314D0028A773 /* XMLSearchPluginParser.mm in Sources */,
+				C795738A0D35314D0028A773 /* OpenSearchParser.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -6024,6 +6070,8 @@
 				33E95A7A0D31B6FA0054C01D /* CHCookieStorage.mm in Sources */,
 				C7FF53810D3528B700194776 /* SearchEngineManager.mm in Sources */,
 				C7FF53830D3528B700194776 /* SearchEngineEditor.mm in Sources */,
+				C795738C0D35314D0028A773 /* XMLSearchPluginParser.mm in Sources */,
+				C795738E0D35314D0028A773 /* OpenSearchParser.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
index 79ec9a4eff1..b8241a8e7f8 100644
--- a/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
+++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/classes.nib
@@ -1,292 +1,371 @@
-{
-    IBClasses = (
-        {CLASS = AutoCompleteDataSource; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            CLASS = AutoCompleteTextField; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {mLockIconContextMenu = NSMenu; mProxyIcon = PageProxyIcon; }; 
-            SUPERCLASS = NSTextField; 
-        }, 
-        {CLASS = BookmarkManagerView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, 
-        {
-            CLASS = BookmarkOutlineView; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = ExtendedOutlineView; 
-        }, 
-        {
-            ACTIONS = {addFolder = id; }; 
-            CLASS = BookmarkToolbar; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSView; 
-        }, 
-        {
-            ACTIONS = {
-                addBookmark = id; 
-                addCollection = id; 
-                addFolder = id; 
-                addSeparator = id; 
-                deleteBookmarks = id; 
-                locateBookmark = id; 
-                openBookmark = id; 
-                openBookmarkInNewTab = id; 
-                openBookmarkInNewWindow = id; 
-                setAsDockMenuFolder = id; 
-                showBookmarkInfo = id; 
-                startSearch = id; 
-            }; 
-            CLASS = BookmarkViewController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                mAddBookmarkButton = NSButton; 
-                mAddCollectionButton = NSButton; 
-                mAddFolderButton = NSButton; 
-                mAddSeparatorButton = NSButton; 
-                mBrowserWindowController = BrowserWindowController; 
-                mContainerPane = ExtendedTableView; 
-                mContainersSplit = NSSplitView; 
-                mHistorySource = HistoryDataSource; 
-                mInfoButton = NSButton; 
-                mItemPane = BookmarkOutlineView; 
-                mItemSearchSplit = NSSplitView; 
-                mSearchButton = NSButton; 
-                mSearchField = NSTextField; 
-                mSearchPane = NSTableView; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {
-            CLASS = BrowserContainerView; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {mTabBarView = BrowserTabBarView; mTabView = BrowserTabView; }; 
-            SUPERCLASS = NSView; 
-        }, 
-        {
-            ACTIONS = {toggleBookmarkManager = id; }; 
-            CLASS = BrowserContentView; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                mBookmarkManagerView = NSView; 
-                mBookmarksToolbar = BookmarkToolbar; 
-                mBrowserContainerView = NSView; 
-                mStatusBar = NSView; 
-            }; 
-            SUPERCLASS = NSView; 
-        }, 
-        {
-            CLASS = BrowserTabBarView; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {mTabView = BrowserTabView; }; 
-            SUPERCLASS = NSView; 
-        }, 
-        {
-            CLASS = BrowserTabView; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {mTabBar = BrowserTabBarView; }; 
-            SUPERCLASS = NSTabView; 
-        }, 
-        {CLASS = BrowserTabViewItem; LANGUAGE = ObjC; SUPERCLASS = IconTabViewItem; }, 
-        {CLASS = BrowserWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; }, 
-        {
-            ACTIONS = {
-                addBookmark = id; 
-                addBookmarkFolder = id; 
-                addBookmarkForLink = id; 
-                addBookmarkSeparator = id; 
-                addBookmarkWithoutPrompt = id; 
-                addTabGroup = id; 
-                addTabGroupWithoutPrompt = id; 
-                addToAddressBook = id; 
-                back = id; 
-                cancelLocationSheet = id; 
-                cancelSearchSheet = id; 
-                closeCurrentTab = id; 
-                closeOtherTabs = id; 
-                closeSendersTab = id; 
-                copyAddressToClipboard = id; 
-                copyImage = id; 
-                copyImageLocation = id; 
-                copyLinkLocation = id; 
-                endLocationSheet = id; 
-                endSearchSheet = id; 
-                forward = id; 
-                frameToNewTab = id; 
-                frameToNewWindow = id; 
-                frameToThisWindow = id; 
-                getInfo = id; 
-                goToLocationFromToolbarURLField = id; 
-                home = id; 
-                makeTextBigger = id; 
-                makeTextDefaultSize = id; 
-                makeTextSmaller = id; 
-                manageBookmarks = id; 
-                manageHistory = id; 
-                moveTabToNewWindow = id; 
-                newTab = id; 
-                nextTab = id; 
-                openFeedPrefPane = id; 
-                openLinkInNewTab = id; 
-                openLinkInNewWindow = id; 
-                pageSetup = id; 
-                previousTab = id; 
-                printDocument = id; 
-                reload = id; 
-                reloadAllTabs = id; 
-                reloadSendersTab = id; 
-                reloadWithNewCharset = id; 
-                saveFrameAs = id; 
-                saveImageAs = id; 
-                saveLinkAs = id; 
-                savePageAs = id; 
-                searchFieldTriggered = id; 
-                searchForSelection = id; 
-                sendURL = id; 
-                sendURLFromLink = id; 
-                showBookmarksInfo = id; 
-                showPageInfo = id; 
-                showSiteCertificate = id; 
-                stop = id; 
-                toggleStatusBar = id; 
-                viewOnlyThisImage = id; 
-                viewPageSource = id; 
-                viewSource = id; 
-            }; 
-            CLASS = BrowserWindowController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                mBackItem = NSMenuItem; 
-                mContentView = BrowserContentView; 
-                mCopyItem = NSMenuItem; 
-                mForwardItem = NSMenuItem; 
-                mImageLinkMenu = NSMenu; 
-                mImageMailToLinkMenu = NSMenu; 
-                mImageMenu = NSMenu; 
-                mInputMenu = NSMenu; 
-                mLinkMenu = NSMenu; 
-                mLocationSheetURLField = NSTextField; 
-                mLocationSheetWindow = NSWindow; 
-                mLocationToolbarView = ExtendedSplitView; 
-                mMailToLinkMenu = NSMenu; 
-                mPageMenu = NSMenu; 
-                mPersonalToolbar = BookmarkToolbar; 
-                mProgress = NSProgressIndicator; 
-                mProxyIcon = PageProxyIcon; 
-                mSearchBar = NSSearchField; 
-                mSearchSheetTextField = NSSearchField; 
-                mSearchSheetWindow = NSWindow; 
-                mStatus = NSTextField; 
-                mStatusBar = NSView; 
-                mTabBarMenu = NSMenu; 
-                mTabBrowser = BrowserTabView; 
-                mTabMenu = NSMenu; 
-                mURLBar = AutoCompleteTextField; 
-            }; 
-            SUPERCLASS = NSWindowController; 
-        }, 
-        {
-            ACTIONS = {load = id; reloadWithNewCharset = id; }; 
-            CLASS = BrowserWrapper; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSView; 
-        }, 
-        {CLASS = ExtendedOutlineView; LANGUAGE = ObjC; SUPERCLASS = NSOutlineView; }, 
-        {CLASS = ExtendedSplitView; LANGUAGE = ObjC; SUPERCLASS = NSSplitView; }, 
-        {CLASS = ExtendedTableView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; }, 
-        {
-            ACTIONS = {addBookmark = id; addBookmarkFolder = id; addBookmarkSeparator = id; }; 
-            CLASS = FirstResponder; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {
-            ACTIONS = {deleteHistoryItems = id; openHistoryItem = id; }; 
-            CLASS = HistoryDataSource; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {mBrowserWindowController = BrowserWindowController; }; 
-            SUPERCLASS = RDFOutlineViewDataSource; 
-        }, 
-        {CLASS = IconTabViewItem; LANGUAGE = ObjC; SUPERCLASS = NSTabViewItem; }, 
-        {CLASS = LocationBar; LANGUAGE = ObjC; SUPERCLASS = NSView; }, 
-        {
-            ACTIONS = {
-                aboutServers = id; 
-                addBookmark = id; 
-                addFolder = id; 
-                addSeparator = id; 
-                biggerTextSize = id; 
-                closeTab = id; 
-                connectToServer = id; 
-                displayPreferencesWindow = id; 
-                doReload = id; 
-                doSearch = id; 
-                doStop = id; 
-                downloadsWindow = id; 
-                exportBookmarks = id; 
-                feedbackLink = id; 
-                findAgain = id; 
-                findInPage = id; 
-                findPrevious = id; 
-                getInfo = id; 
-                goBack = id; 
-                goForward = id; 
-                goHome = id; 
-                importBookmarks = id; 
-                infoLink = id; 
-                manageSidebar = id; 
-                newTab = id; 
-                newWindow = id; 
-                nextTab = id; 
-                openFile = id; 
-                openLocation = id; 
-                openMenuBookmark = id; 
-                pageSetup = id; 
-                previousTab = id; 
-                printPage = id; 
-                reloadWithCharset = id; 
-                savePage = id; 
-                sendURL = id; 
-                showAboutBox = id; 
-                smallerTextSize = id; 
-                toggleBookmarksToolbar = id; 
-                toggleOfflineMode = id; 
-                toggleSidebar = id; 
-                viewSource = id; 
-            }; 
-            CLASS = MainController; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                mAddBookmarkMenuItem = NSMenuItem; 
-                mApplication = NSApplication; 
-                mBookmarksMenu = NSMenu; 
-                mBookmarksToolbarMenuItem = NSMenuItem; 
-                mCloseTabMenuItem = NSMenuItem; 
-                mCloseWindowMenuItem = NSMenuItem; 
-                mCreateBookmarksFolderMenuItem = NSMenuItem; 
-                mCreateBookmarksSeparatorMenuItem = NSMenuItem; 
-                mDockMenu = NSMenu; 
-                mFilterView = NSView; 
-                mGoMenu = NSMenu; 
-                mServersSubmenu = NSMenu; 
-                mToggleSidebarMenuItem = NSMenuItem; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {CLASS = NSImage; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = NSObject; LANGUAGE = ObjC; }, 
-        {CLASS = PageProxyIcon; LANGUAGE = ObjC; SUPERCLASS = NSImageView; }, 
-        {
-            CLASS = RDFOutlineViewDataSource; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {mOutlineView = ExtendedOutlineView; }; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {CLASS = RDFOutlineViewItem; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = RolloverTrackingCell; LANGUAGE = ObjC; SUPERCLASS = NSCell; }, 
-        {CLASS = SearchTextField; LANGUAGE = ObjC; SUPERCLASS = NSTextField; }, 
-        {CLASS = StatusBarView; LANGUAGE = ObjC; SUPERCLASS = NSView; }, 
-        {CLASS = TabButtonCell; LANGUAGE = ObjC; SUPERCLASS = RolloverTrackingCell; }, 
-        {CLASS = ThrobberHandler; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = TruncatingTextAndImageCell; LANGUAGE = ObjC; SUPERCLASS = NSCell; }, 
-        {CLASS = WebSearchField; LANGUAGE = ObjC; SUPERCLASS = NSSearchField; }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBClasses</key>
+	<array>
+		<dict>
+			<key>CLASS</key>
+			<string>BrowserTabView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>mTabBar</key>
+				<string>BrowserTabBarView</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>NSTabView</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>BrowserTabViewItem</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>IconTabViewItem</string>
+		</dict>
+		<dict>
+			<key>ACTIONS</key>
+			<dict>
+				<key>addBookmark</key>
+				<string>id</string>
+				<key>addBookmarkFolder</key>
+				<string>id</string>
+				<key>addBookmarkForLink</key>
+				<string>id</string>
+				<key>addBookmarkSeparator</key>
+				<string>id</string>
+				<key>addBookmarkWithoutPrompt</key>
+				<string>id</string>
+				<key>addTabGroup</key>
+				<string>id</string>
+				<key>addTabGroupWithoutPrompt</key>
+				<string>id</string>
+				<key>addToAddressBook</key>
+				<string>id</string>
+				<key>back</key>
+				<string>id</string>
+				<key>cancelLocationSheet</key>
+				<string>id</string>
+				<key>cancelSearchSheet</key>
+				<string>id</string>
+				<key>closeCurrentTab</key>
+				<string>id</string>
+				<key>closeOtherTabs</key>
+				<string>id</string>
+				<key>closeSendersTab</key>
+				<string>id</string>
+				<key>copyAddressToClipboard</key>
+				<string>id</string>
+				<key>copyImage</key>
+				<string>id</string>
+				<key>copyImageLocation</key>
+				<string>id</string>
+				<key>copyLinkLocation</key>
+				<string>id</string>
+				<key>endLocationSheet</key>
+				<string>id</string>
+				<key>endSearchSheet</key>
+				<string>id</string>
+				<key>forward</key>
+				<string>id</string>
+				<key>frameToNewTab</key>
+				<string>id</string>
+				<key>frameToNewWindow</key>
+				<string>id</string>
+				<key>frameToThisWindow</key>
+				<string>id</string>
+				<key>getInfo</key>
+				<string>id</string>
+				<key>goToLocationFromToolbarURLField</key>
+				<string>id</string>
+				<key>home</key>
+				<string>id</string>
+				<key>makeTextBigger</key>
+				<string>id</string>
+				<key>makeTextDefaultSize</key>
+				<string>id</string>
+				<key>makeTextSmaller</key>
+				<string>id</string>
+				<key>manageBookmarks</key>
+				<string>id</string>
+				<key>manageHistory</key>
+				<string>id</string>
+				<key>moveTabToNewWindow</key>
+				<string>id</string>
+				<key>newTab</key>
+				<string>id</string>
+				<key>nextTab</key>
+				<string>id</string>
+				<key>openFeedPrefPane</key>
+				<string>id</string>
+				<key>openLinkInNewTab</key>
+				<string>id</string>
+				<key>openLinkInNewWindow</key>
+				<string>id</string>
+				<key>pageSetup</key>
+				<string>id</string>
+				<key>previousTab</key>
+				<string>id</string>
+				<key>printDocument</key>
+				<string>id</string>
+				<key>reload</key>
+				<string>id</string>
+				<key>reloadAllTabs</key>
+				<string>id</string>
+				<key>reloadSendersTab</key>
+				<string>id</string>
+				<key>reloadWithNewCharset</key>
+				<string>id</string>
+				<key>saveFrameAs</key>
+				<string>id</string>
+				<key>saveImageAs</key>
+				<string>id</string>
+				<key>saveLinkAs</key>
+				<string>id</string>
+				<key>savePageAs</key>
+				<string>id</string>
+				<key>searchFieldTriggered</key>
+				<string>id</string>
+				<key>searchForSelection</key>
+				<string>id</string>
+				<key>sendURL</key>
+				<string>id</string>
+				<key>sendURLFromLink</key>
+				<string>id</string>
+				<key>showBookmarksInfo</key>
+				<string>id</string>
+				<key>showPageInfo</key>
+				<string>id</string>
+				<key>showSiteCertificate</key>
+				<string>id</string>
+				<key>stop</key>
+				<string>id</string>
+				<key>toggleStatusBar</key>
+				<string>id</string>
+				<key>viewOnlyThisImage</key>
+				<string>id</string>
+				<key>viewPageSource</key>
+				<string>id</string>
+				<key>viewSource</key>
+				<string>id</string>
+			</dict>
+			<key>CLASS</key>
+			<string>BrowserWindowController</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>mBackItem</key>
+				<string>NSMenuItem</string>
+				<key>mContentView</key>
+				<string>BrowserContentView</string>
+				<key>mCopyItem</key>
+				<string>NSMenuItem</string>
+				<key>mForwardItem</key>
+				<string>NSMenuItem</string>
+				<key>mImageLinkMenu</key>
+				<string>NSMenu</string>
+				<key>mImageMailToLinkMenu</key>
+				<string>NSMenu</string>
+				<key>mImageMenu</key>
+				<string>NSMenu</string>
+				<key>mInputMenu</key>
+				<string>NSMenu</string>
+				<key>mLinkMenu</key>
+				<string>NSMenu</string>
+				<key>mLocationSheetURLField</key>
+				<string>NSTextField</string>
+				<key>mLocationSheetWindow</key>
+				<string>NSWindow</string>
+				<key>mLocationToolbarView</key>
+				<string>ExtendedSplitView</string>
+				<key>mMailToLinkMenu</key>
+				<string>NSMenu</string>
+				<key>mPageMenu</key>
+				<string>NSMenu</string>
+				<key>mPersonalToolbar</key>
+				<string>BookmarkToolbar</string>
+				<key>mProgress</key>
+				<string>NSProgressIndicator</string>
+				<key>mProxyIcon</key>
+				<string>PageProxyIcon</string>
+				<key>mSearchBar</key>
+				<string>NSSearchField</string>
+				<key>mSearchSheetTextField</key>
+				<string>NSSearchField</string>
+				<key>mSearchSheetWindow</key>
+				<string>NSWindow</string>
+				<key>mStatus</key>
+				<string>NSTextField</string>
+				<key>mStatusBar</key>
+				<string>NSView</string>
+				<key>mTabBarMenu</key>
+				<string>NSMenu</string>
+				<key>mTabBrowser</key>
+				<string>BrowserTabView</string>
+				<key>mTabMenu</key>
+				<string>NSMenu</string>
+				<key>mURLBar</key>
+				<string>AutoCompleteTextField</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>NSWindowController</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>PageProxyIcon</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSImageView</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>BrowserWindow</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSWindow</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>AutoCompleteTextField</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>mLockIconContextMenu</key>
+				<string>NSMenu</string>
+				<key>mProxyIcon</key>
+				<string>PageProxyIcon</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>NSTextField</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>BrowserContainerView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>mTabBarView</key>
+				<string>BrowserTabBarView</string>
+				<key>mTabView</key>
+				<string>BrowserTabView</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>NSView</string>
+		</dict>
+		<dict>
+			<key>ACTIONS</key>
+			<dict>
+				<key>addBookmark</key>
+				<string>id</string>
+				<key>addBookmarkFolder</key>
+				<string>id</string>
+				<key>addBookmarkSeparator</key>
+				<string>id</string>
+			</dict>
+			<key>CLASS</key>
+			<string>FirstResponder</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSObject</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+		</dict>
+		<dict>
+			<key>ACTIONS</key>
+			<dict>
+				<key>addFolder</key>
+				<string>id</string>
+			</dict>
+			<key>CLASS</key>
+			<string>BookmarkToolbar</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSView</string>
+		</dict>
+		<dict>
+			<key>ACTIONS</key>
+			<dict>
+				<key>toggleBookmarkManager</key>
+				<string>id</string>
+			</dict>
+			<key>CLASS</key>
+			<string>BrowserContentView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>mBookmarkManagerView</key>
+				<string>NSView</string>
+				<key>mBookmarksToolbar</key>
+				<string>BookmarkToolbar</string>
+				<key>mBrowserContainerView</key>
+				<string>NSView</string>
+				<key>mStatusBar</key>
+				<string>NSView</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>NSView</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>WebSearchField</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSSearchField</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>BrowserTabBarView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>mTabView</key>
+				<string>BrowserTabView</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>NSView</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>ExtendedSplitView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSSplitView</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>StatusBarView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSView</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>IconTabViewItem</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSTabViewItem</string>
+		</dict>
+	</array>
+	<key>IBVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
index ea4a28f939e..9e543a3d54c 100644
--- a/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
+++ b/camino/resources/localized/English.lproj/BrowserWindow.nib/info.nib
@@ -1,30 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>IBDocumentLocation</key>
-	<string>67 57 356 240 0 0 1680 1028 </string>
-	<key>IBEditorPositions</key>
-	<dict>
-		<key>1066</key>
-		<string>679 653 370 64 0 0 1680 1028 </string>
-		<key>297</key>
-		<string>67 302 226 337 0 0 1680 1028 </string>
-		<key>336</key>
-		<string>67 302 226 206 0 0 1680 1028 </string>
-		<key>463</key>
-		<string>71 338 226 294 0 0 1680 1028 </string>
-	</dict>
 	<key>IBFramework Version</key>
-	<string>446.1</string>
+	<string>629</string>
+	<key>IBOldestOS</key>
+	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>336</integer>
-		<integer>1066</integer>
-		<integer>463</integer>
-		<integer>806</integer>
+		<integer>460</integer>
+		<integer>804</integer>
+		<integer>1128</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>8P2137</string>
+	<string>9B18</string>
+	<key>targetFramework</key>
+	<string>IBCocoaFramework</string>
 </dict>
 </plist>
diff --git a/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib b/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib
index f57ba3e3f4f..0f8bd78bb16 100644
Binary files a/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib and b/camino/resources/localized/English.lproj/BrowserWindow.nib/keyedobjects.nib differ