rename local_launch.sh to more general name and add command-line param

22 files changed, 281 insertions, 318 deletions

diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/Cache/_CACHE_MAP_ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/Cache/_CACHE_MAP_
index 34fd086..68543d9 100644
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/Cache/_CACHE_MAP_
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/Cache/_CACHE_MAP_
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/OfflineCache/index.sqlite b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/OfflineCache/index.sqlite
index 74441b4..3f98a6a 100755
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/OfflineCache/index.sqlite
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/OfflineCache/index.sqlite
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/XPC.mfasl b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/XPC.mfasl
index 3444cbd..97b39b1 100644
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/XPC.mfasl
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/XPC.mfasl
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/XUL.mfasl b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/XUL.mfasl
index 8be67fe..b838166 100644
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/XUL.mfasl
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/XUL.mfasl
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/bookmarkbackups/bookmarks-2010-02-23.json b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/bookmarkbackups/bookmarks-2010-02-23.json
new file mode 100644
index 0000000..d3a3d42
--- /dev/null
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/bookmarkbackups/bookmarks-2010-02-23.json
@@ -0,0 +1 @@
+{"title":"","id":1,"dateAdded":1237609249913830,"lastModified":1237609249960242,"type":"text/x-moz-place-container","root":"placesRoot","children":[{"title":"Bookmarks Menu","id":2,"parent":1,"dateAdded":1237609249956035,"lastModified":1264423468259153,"type":"text/x-moz-place-container","root":"bookmarksMenuFolder","children":[{"title":"Recent Tags","id":12,"parent":2,"annos":[{"name":"Places/SmartBookmark","flags":0,"expires":4,"mimeType":null,"type":3,"value":"RecentTags"}],"type":"text/x-moz-place","uri":"place:sort=14&type=6&maxResults=10&queryType=1"},{"index":1,"title":"Recently Bookmarked","id":11,"parent":2,"annos":[{"name":"Places/SmartBookmark","flags":0,"expires":4,"mimeType":null,"type":3,"value":"RecentlyBookmarked"}],"type":"text/x-moz-place","uri":"place:folder=BOOKMARKS_MENU&folder=UNFILED_BOOKMARKS&folder=TOOLBAR&sort=12&excludeQueries=1&excludeItemIfParentHasAnnotation=livemark%2FfeedURI&maxResults=10&queryType=1"},{"index":2,"title":"","id":9,"parent":2,"dateAdded":1237609250110898,"lastModified":1237609250110898,"type":"text/x-moz-place-separator"}]},{"index":1,"title":"Bookmarks Toolbar","id":3,"parent":1,"dateAdded":1237609249957467,"lastModified":1264423468256618,"annos":[{"name":"bookmarkProperties/description","flags":0,"expires":4,"mimeType":null,"type":3,"value":"Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar"}],"type":"text/x-moz-place-container","root":"toolbarFolder","children":[{"title":"Most Visited","id":10,"parent":3,"annos":[{"name":"Places/SmartBookmark","flags":0,"expires":4,"mimeType":null,"type":3,"value":"MostVisited"}],"type":"text/x-moz-place","uri":"place:sort=8&redirectsMode=2&maxResults=10"}]},{"index":2,"title":"Tags","id":4,"parent":1,"dateAdded":1237609249958771,"lastModified":1264423468222292,"type":"text/x-moz-place-container","root":"tagsFolder","children":[]},{"index":3,"title":"Unsorted Bookmarks","id":5,"parent":1,"dateAdded":1237609249960063,"lastModified":1264423468222113,"type":"text/x-moz-place-container","root":"unfiledBookmarksFolder","children":[]}]}
\ No newline at end of file
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/compatibility.ini b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/compatibility.ini
index 4edbd5f..752ce53 100755
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/compatibility.ini
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/compatibility.ini
@@ -1,5 +1,5 @@
 [Compatibility]
 LastVersion=3.6_20100115133306/20100115133306
 LastOSABI=Linux_x86-gcc3
-LastPlatformDir=/home/hitman/Software/firefox-3.6-EPaath
-LastAppDir=/home/hitman/Software/firefox-3.6-EPaath
+LastPlatformDir=/home/hitman/karma/mainline/tools/xo_bundle
+LastAppDir=/home/hitman/karma/mainline/tools/xo_bundle
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/compreg.dat b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/compreg.dat
index a558599..c830a6e 100644
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/compreg.dat
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/compreg.dat
@@ -4,70 +4,65 @@ Generated File. Do not edit.
 Version,0,5
 
 [COMPONENTS]
-rel:nsFormAutoComplete.js,1263595301000
-abs:/home/hitman/Software/firefox-3.6-EPaath/extensions/firebug@software.joehewitt.com/components/firebug-channel-listener.js,1264429470000
-rel:nsSidebar.js,1263595301000
-rel:storage-mozStorage.js,1263595301000
-rel:nsDefaultCLH.js,1263595301000
-rel:nsSessionStore.js,1263595301000
-rel:txEXSLTRegExFunctions.js,1263595301000
-rel:libbrowserdirprovider.so,1263595306000
-rel:nsContentDispatchChooser.js,1263595301000
-rel:FeedWriter.js,1263595300000
-rel:nsPrivateBrowsingService.js,1263595300000
-rel:nsBrowserGlue.js,1263595300000
-rel:FeedProcessor.js,1263595300000
-rel:nsSetDefaultBrowser.js,1263595300000
-rel:nsLoginInfo.js,1263595300000
-abs:/home/hitman/Software/firefox-3.6-EPaath/extensions/firebug@software.joehewitt.com/components/firebug-annotations.js,1264429470000
-rel:FeedConverter.js,1263595300000
-rel:nsHandlerService.js,1263595301000
-rel:nsDownloadManagerUI.js,1263595301000
-rel:nsHelperAppDlg.js,1263595301000
-rel:nsUrlClassifierListManager.js,1263595302000
-rel:nsSessionStartup.js,1263595301000
-rel:WebContentConverter.js,1263595300000
-rel:libnkgnomevfs.so,1263595306000
-rel:nsPlacesDBFlush.js,1263595301000
-rel:nsUpdateServiceStub.js,1263595301000
-rel:libmozgnome.so,1263595306000
-rel:storage-Legacy.js,1263595300000
-rel:nsSafebrowsingApplication.js,1263595302000
-rel:nsUpdateTimerManager.js,1263595301000
-rel:nsLivemarkService.js,1263595301000
-rel:nsLoginManager.js,1263595300000
-rel:nsPlacesTransactionsService.js,1263595300000
-rel:nsProxyAutoConfig.js,1263595301000
-rel:nsBadCertHandler.js,1263595301000
-rel:nsFilePicker.js,1263595301000
-rel:nsTryToClose.js,1263595300000
-rel:libdbusservice.so,1263595306000
-rel:fuelApplication.js,1263595300000
-rel:nsWebHandlerApp.js,1263595301000
-rel:nsExtensionManager.js,1263595301000
-rel:nsBlocklistService.js,1263595301000
-rel:nsUpdateService.js,1263595301000
-rel:pluginGlue.js,1263595301000
-rel:nsSearchService.js,1263595300000
-abs:/home/hitman/Software/firefox-3.6-EPaath/extensions/firebug@software.joehewitt.com/components/firebug-service.js,1264429470000
-abs:/home/hitman/Software/firefox-3.6-EPaath/extensions/firebug@software.joehewitt.com/components/firebug-trace-service.js,1264429470000
-rel:nsTaggingService.js,1263595301000
-rel:nsMicrosummaryService.js,1263595300000
-rel:GPSDGeolocationProvider.js,1263595301000
-rel:libbrowsercomps.so,1263595306000
-rel:NetworkGeolocationProvider.js,1263595301000
-rel:nsURLFormatter.js,1263595301000
-rel:nsUrlClassifierLib.js,1263595302000
-rel:jsconsole-clhandler.js,1263595301000
+rel:nsLivemarkService.js,1266149691000
+rel:nsBadCertHandler.js,1266146699000
+rel:nsContentPrefService.js,1266149691000
+rel:nsDownloadManagerUI.js,1266146699000
+rel:nsExtensionManager.js,1266149691000
+rel:nsPlacesAutoComplete.js,1266149691000
+rel:nsUrlClassifierLib.js,1266149691000
+rel:nsPlacesTransactionsService.js,1266149691000
+rel:nsBrowserGlue.js,1266149691000
+rel:libnkgnomevfs.so,1266149691000
+rel:nsBrowserContentHandler.js,1266149691000
+rel:nsSafebrowsingApplication.js,1266149691000
+rel:nsSetDefaultBrowser.js,1266146699000
+rel:nsDefaultCLH.js,1266149691000
+rel:libdbusservice.so,1266149691000
+rel:nsLoginInfo.js,1266146699000
+rel:libbrowserdirprovider.so,1266149691000
+rel:nsTryToClose.js,1266146699000
+rel:nsProxyAutoConfig.js,1266146699000
+rel:nsFilePicker.js,1266149691000
+rel:nsLoginManager.js,1266149691000
+rel:nsURLFormatter.js,1266149691000
+rel:libmozgnome.so,1266149691000
+rel:libbrowsercomps.so,1266149691000
+rel:nsSessionStartup.js,1266149691000
+rel:WebContentConverter.js,1266149691000
+rel:nsSessionStore.js,1266149691000
+rel:nsTaggingService.js,1266149691000
+rel:txEXSLTRegExFunctions.js,1266146699000
+rel:nsBlocklistService.js,1266149691000
+rel:nsPlacesDBFlush.js,1266149691000
+rel:nsSearchService.js,1266149691000
+rel:nsUpdateTimerManager.js,1266149691000
+rel:FeedProcessor.js,1266149691000
+rel:nsLoginManagerPrompter.js,1266149691000
+rel:nsUrlClassifierListManager.js,1266149691000
+rel:nsHelperAppDlg.js,1266149691000
+rel:storage-Legacy.js,1266146699000
+rel:nsUpdateServiceStub.js,1266149691000
+rel:nsPrivateBrowsingService.js,1266149691000
+rel:nsFormAutoComplete.js,1266149691000
+rel:FeedConverter.js,1266149691000
+rel:pluginGlue.js,1266146699000
+rel:nsHandlerService.js,1266146699000
+rel:NetworkGeolocationProvider.js,1266149691000
+rel:fuelApplication.js,1266149691000
+rel:jsconsole-clhandler.js,1266149691000
+rel:nsMicrosummaryService.js,1266149691000
+rel:nsWebHandlerApp.js,1266146699000
 abs:/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/ubufox@ubuntu.com/components/pluginGlue.js,1255356949000
-rel:nsLoginManagerPrompter.js,1263595300000
-rel:nsAddonRepository.js,1263595300000
-abs:/home/hitman/Software/firefox-3.6-EPaath/extensions/firebug@software.joehewitt.com/components/firebug-http-observer.js,1264429470000
-rel:libimgicon.so,1263595306000
-rel:nsSearchSuggestions.js,1263595300000
-rel:nsContentPrefService.js,1263595301000
-rel:nsBrowserContentHandler.js,1263595300000
-rel:nsPlacesAutoComplete.js,1263595301000
+rel:nsAddonRepository.js,1266149691000
+rel:nsSidebar.js,1266149691000
+rel:libimgicon.so,1266149691000
+rel:nsUpdateService.js,1266149691000
+rel:nsContentDispatchChooser.js,1266149691000
+rel:nsSearchSuggestions.js,1266149691000
+rel:storage-mozStorage.js,1266149691000
+rel:FeedWriter.js,1266149691000
+rel:GPSDGeolocationProvider.js,1266149691000
 
 [CLASSIDS]
 {bfc310d2-38a0-11d3-8cd3-0060b0fc14a3},,application/x-mozilla-static,,nsLayoutModule
@@ -75,15 +70,16 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {a277189c-1dd1-11b2-a8c9-e4e8bfb1338e},,application/x-mozilla-static,,NSS
 {75656ad9-bd13-4c5d-939a-ec6351eea0cc},,application/x-mozilla-static,,nsComposerModule
 {ba6151ad-1dfa-11d3-b3bf-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
+{8df290ae-dcaa-4c11-98a5-2429a4dc97bb},,text/javascript,,rel:nsContentPrefService.js
 {495eca42-0a5c-11d4-a135-005004832142},,application/x-mozilla-static,,nsUConvModule
 {0cd233e0-7a86-11d3-915c-006008a6edf6},,application/x-mozilla-static,,nsI18nModule
 {73bb7c12-dbab-4ae2-aecf-a0331dec916f},,application/x-mozilla-static,,nsUCvMathModule
 {cb6593e0-f9b2-11d2-bdd6-000064657374},@mozilla.org/js/xpc/XPConnect;1,application/x-mozilla-static,,xpconnect
 {e768ebef-70f9-4fe3-8835-4f4f3fd996e2},,application/x-mozilla-static,,nsUCvMathModule
-{5d0ce354-df01-421a-83fb-7ead0990c24e},,text/javascript,,rel:nsBrowserContentHandler.js
+{229fa115-9412-4d32-baf3-2fc407f76fb1},,text/javascript,,rel:FeedConverter.js
 {4bfaa9f0-1dd2-11b2-afae-a82cbaa0b606},,application/x-mozilla-static,,PKI
 {f1299dc2-1dd1-11b2-a347-ee6b7660e048},,application/x-mozilla-static,,JavaScript_Debugger
-{c1751cfc-e8f1-4ade-b0bb-f74edfb8ef6a},,text/javascript,,rel:nsPlacesDBFlush.js
+{77da64d3-7458-4920-9491-86cc9914f904},,text/javascript,,rel:NetworkGeolocationProvider.js
 {5eb7c3c1-ec1f-4007-87cc-eefb37d68ce6},,application/x-mozilla-static,,nsToolkitCompsModule
 {6394eeae-fc3d-11d2-b3b8-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
 {d4f2b600-b5c1-11d6-b483-cc97c63e567c},,application/x-mozilla-static,,nsLayoutModule
@@ -123,10 +119,10 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {7c657d14-ec5e-11d2-8aac-00600811a836},,application/x-mozilla-static,,nsUConvModule
 {6394eea6-fc3d-11d2-b3b8-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
 {ba61519b-1dfa-11d3-b3bf-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
+{5d0ce354-df01-421a-83fb-7ead0990c24e},,text/javascript,,rel:nsBrowserContentHandler.js
 {831f8f13-7aa8-485f-b02e-77c881cc5773},,application/x-mozilla-static,,necko
 {660d8ca6-f763-11d2-8aad-00600811a836},,application/x-mozilla-static,,nsUConvModule
 {7294fe9c-14d8-11d5-9882-00c04fa02f40},,application/x-mozilla-static,,docshell_provider
-{eab9012e-5f74-4cbc-b2b5-a590235513cc},,text/javascript,,rel:nsBrowserGlue.js
 {ba6151a3-1dfa-11d3-b3bf-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
 {eaca2576-0d4a-11d3-9d7e-0060088f9ff7},,application/x-mozilla-static,,nsLayoutModule
 {b88a4712-eb52-4c10-9b85-bf5894b510f0},,application/x-mozilla-static,,nsLayoutModule
@@ -176,16 +172,17 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {2b026890-5a2e-4981-ada2-a600358947b4},,application/x-mozilla-static,,nsUConvModule
 {214c48a0-b57f-11d4-959c-0020183bf181},,application/x-mozilla-static,,docshell_provider
 {74b7a390-3b41-11d4-8a80-006008c844c3},,application/x-mozilla-static,,NSS
-{22117140-9c6e-11d3-aaf1-00805f8a4905},,text/javascript,,rel:nsSidebar.js
+{f57899d0-4e2c-4ac6-9e29-50c736103b0c},,text/javascript,,rel:nsSetDefaultBrowser.js
 {9de95a0c-39a4-4d64-9a53-17940dd7cabb},,application/x-mozilla-static,,nsPlacesModule
 {66856477-6596-40eb-bb87-59ca2dabb6f7},,application/x-mozilla-static,,nsLayoutModule
 {dbded6ec-edbf-4054-a834-287b82c260f9},,text/javascript,,rel:nsBadCertHandler.js
 {892ffeb0-3f80-11d3-a16c-0050041caf44},,application/x-mozilla-static,,necko
 {929d9320-251e-11d4-8a7c-006008c844c3},,application/x-mozilla-static,,NSS
 {1f4dbcf7-245c-4c8c-943d-8a1da0495e8a},,application/x-mozilla-static,,necko
-{7e4bb6ad-2fc4-4dc6-89ef-23e8e5ccf980},,application/x-mozilla-native,,rel:libbrowsercomps.so
+{eab9012e-5f74-4cbc-b2b5-a590235513cc},,text/javascript,,rel:nsBrowserGlue.js
 {6394eeab-fc3d-11d2-b3b8-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
 {ab1da296-6125-40ba-96d0-47a8282ae3db},,application/x-mozilla-static,,nsParserModule
+{4ca3c946-5408-49f0-9eca-3a97d5c67750},,application/x-mozilla-native,,rel:libbrowsercomps.so
 {d0272978-beab-4adc-a3d4-04b76acfa4e7},,text/javascript,,rel:nsPlacesAutoComplete.js
 {f30bc0a2-958b-4287-bf62-ce38ba0c811e},,application/x-mozilla-static,,docshell_provider
 {66634f68-be19-42d0-a4ca-d1c21fa059b8},,application/x-mozilla-static,,nsUConvModule
@@ -215,7 +212,7 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {7d7008a0-c49a-11d3-9b22-0080c7cb1080},,application/x-mozilla-static,,necko
 {77cfaaf1-1cf4-11d3-8aaf-00600811a836},,application/x-mozilla-static,,nsUConvModule
 {6394eeb8-fc3d-11d2-b3b8-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
-{0099907d-123c-4853-a46a-43098b5fb68c},@mozilla.org/appshell/appShellService;1,application/x-mozilla-static,AppShell Service,appshell
+{0099907d-123c-4853-a46a-43098b5fb68c},,application/x-mozilla-static,,appshell
 {cb60980e-18a5-4a77-9110-8146614ca7f0},,application/x-mozilla-static,,nsFileViewModule
 {ba6151a2-1dfa-11d3-b3bf-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
 {379c2771-ec77-11d2-8aac-00600811a836},,application/x-mozilla-static,,nsUConvModule
@@ -236,12 +233,11 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {2bf64764-997f-450d-af96-3028d1a902b0},,application/x-mozilla-static,,nsI18nModule
 {fcacef23-2b40-11d3-b3bf-00805f8a6670},,application/x-mozilla-static,,nsUniversalCharDetModule
 {0885d4f8-f7b8-4cda-902e-94ba38bc256e},,application/x-mozilla-static,,necko
-{a380e9c0-cb39-11da-a94d-0800200c9a66},,text/javascript,,abs:/home/hitman/Software/firefox-3.6-EPaath/extensions/firebug@software.joehewitt.com/components/firebug-service.js
 {7c02eadc-0076-4d03-998d-80d779c48589},,application/x-mozilla-static,,nsSecurityManagerModule
 {895db6c7-dbdf-40ea-9f64-b175033243dc},,application/x-mozilla-static,,satchel
 {e12752f0-ee9a-11d1-a82a-0040959a28c9},,application/x-mozilla-static,,nsGfxModule
 {47049e42-1d87-482a-984d-56ae185e367a},,application/x-mozilla-static,,nsChromeModule
-{8df290ae-dcaa-4c11-98a5-2429a4dc97bb},,text/javascript,,rel:nsContentPrefService.js
+{c1751cfc-e8f1-4ade-b0bb-f74edfb8ef6a},,text/javascript,,rel:nsPlacesDBFlush.js
 {ba6151af-1dfa-11d3-b3bf-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
 {376ff2c1-9bf6-418a-b143-3340c00112f7},,application/x-mozilla-static,,nsImageLib2Module
 {495eca44-0a5c-11d4-a135-005004832142},,application/x-mozilla-static,,nsUConvModule
@@ -270,7 +266,6 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {e6a3f533-4ffa-4615-8eb4-d4e72d883fa7},,text/javascript,,rel:nsContentPrefService.js
 {2e9b69dd-9087-438c-8b5d-f77b553abefb},,application/x-mozilla-static,,docshell_provider
 {e64f152a-9f07-11d3-8cda-0060b0fc14a3},@mozilla.org/network/protocol;1?name=resource,application/x-mozilla-static,nsResProtocolHandler,necko
-{26a4a019-2827-4a89-a85c-5931a678823a},,text/javascript,,rel:nsUrlClassifierLib.js
 {4a6212db-accb-11d3-b765-0060b0b6cecb},,application/x-mozilla-static,,nsSecurityManagerModule
 {bbbb1d61-438f-4436-92ed-8308e5830fb0},,application/x-mozilla-static,,mozStorageModule
 {7319788a-fe93-4db3-9f39-818cf08f4256},,text/javascript,,rel:nsSearchService.js
@@ -308,7 +303,7 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {0958b101-9ada-11d2-8ebc-00805f29f370},,application/x-mozilla-static,,nsRDFModule
 {9158c470-86e4-11d4-9be2-00e09872a416},,application/x-mozilla-static,,necko
 {b9507aec-1dd1-11b2-8cd5-c48ee0c50307},,application/x-mozilla-static,,NSS
-{c64d0bcb-8270-4ca7-a0b3-3380c8ffecb5},,text/javascript,,rel:nsSafebrowsingApplication.js
+{26a4a019-2827-4a89-a85c-5931a678823a},,text/javascript,,rel:nsUrlClassifierLib.js
 {b6ed3030-6183-11d3-a178-0050041caf44},,application/x-mozilla-static,,necko
 {c07e81e0-ef12-11d2-92b6-00105a1b0d64},@mozilla.org/network/socket-transport-service;1,application/x-mozilla-static,nsSocketTransportService,necko
 {64d6174c-1496-4ffd-87f2-da2670f88934},,application/x-mozilla-static,,mozSpellCheckerModule
@@ -339,9 +334,10 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {5d5d92cd-6bf8-11d9-bf4a-000a95dc234c},,application/x-mozilla-static,,nsLayoutModule
 {2d524fda-ae74-11d3-abf7-0004aceefa51},,application/x-mozilla-static,,nsUConvModule
 {7baf62e0-8e61-11d2-8eb1-00805f29f370},,application/x-mozilla-static,,nsRDFModule
-{136e2c4d-c5a4-477c-b131-d93d7d704f64},@mozilla.org/privatebrowsing-wrapper;1,application/x-mozilla-native,PrivateBrowsing Service C++ Wrapper,rel:libbrowsercomps.so
+{136e2c4d-c5a4-477c-b131-d93d7d704f64},,application/x-mozilla-native,,rel:libbrowsercomps.so
 {0f2f347c-1e4f-40cc-8efd-792dea70a85e},,text/javascript,,rel:nsLoginInfo.js
 {2ee83680-2af0-4bcb-bfa0-c9705f6554f1},,application/x-mozilla-static,,docshell_provider
+{7e4bb6ad-2fc4-4dc6-89ef-23e8e5ccf980},,application/x-mozilla-native,,rel:libbrowsercomps.so
 {414af362-9ad8-4296-898e-62247f25a20e},,text/javascript,,rel:FeedProcessor.js
 {2d524fdd-ae74-11d3-abf7-0004aceefa51},,application/x-mozilla-static,,nsUConvModule
 {aaab6710-0f2c-11d5-a53b-0010a401eb10},,application/x-mozilla-static,,necko
@@ -360,7 +356,6 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {0de2fbfa-6b7f-11d7-bbba-0003938a9d96},,application/x-mozilla-static,,nsLayoutModule
 {ba6151ac-1dfa-11d3-b3bf-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
 {cb3ede1a-0fa5-4e27-aafe-0f7801e5a1f1},,application/x-mozilla-static,,nsImageLib2Module
-{5aaeb534-fa57-488d-9a73-20c258fc7bdb},,text/javascript,,abs:/home/hitman/Software/firefox-3.6-EPaath/extensions/firebug@software.joehewitt.com/components/firebug-channel-listener.js
 {c94f4a30-64d7-11d4-9960-00b0d02354a0},,application/x-mozilla-static,,NSS
 {56ad2981-8a87-11d2-918c-0080c8e44db5},,application/x-mozilla-static,,nsLayoutModule
 {822bcd11-6432-48be-9e9d-36f7804b7747},,application/x-mozilla-static,,nsCookieModule
@@ -373,7 +368,7 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {e6156350-2be8-11db-a98b-0800200c9a66},,text/javascript,,rel:nsURLFormatter.js
 {6394eead-fc3d-11d2-b3b8-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
 {42c52b81-a200-11d3-9d0b-0050040007b2},,application/x-mozilla-static,,nsXPIntlModule
-{5d0cfa97-69dd-4e5e-ac84-f253162e8f9a},,text/javascript,,rel:FeedProcessor.js
+{32314cc8-22f7-4f7f-a645-1a45453ba6a6},,text/javascript,,rel:nsHandlerService.js
 {a59da932-4091-11d5-a145-005004832142},,application/x-mozilla-static,,nsUConvModule
 {bfcb82c2-5611-4318-90d6-baf4a7864252},,application/x-mozilla-static,,nsLayoutModule
 {9d3f70da-86e9-11d4-95ec-00b0d03e37b7},,application/x-mozilla-static,,nsLayoutModule
@@ -383,7 +378,7 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {7526a738-9632-11d3-8cd9-0060b0fc14a3},,application/x-mozilla-static,,nsJarModule
 {ff8c4d10-3194-11d3-9885-006008962422},@mozilla.org/js/xpc/ContextStack;1,application/x-mozilla-static,,xpconnect
 {d2800356-c2d7-4e05-a884-79fe566af1cf},,application/x-mozilla-static,,nsUConvModule
-{9868b4ce-da08-11d3-8cda-0060b0fc14a3},@mozilla.org/network/buffered-output-stream;1,application/x-mozilla-static,nsBufferedOutputStream,necko
+{9868b4ce-da08-11d3-8cda-0060b0fc14a3},,application/x-mozilla-static,,necko
 {ba6151b9-1dfa-11d3-b3bf-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
 {d9b1f97f-cfa0-80b6-fb92-9972e48e3dcc},,application/x-mozilla-static,,nsUConvModule
 {bc54f001-6eb0-4e32-9f49-7e064d8e70ef},,application/x-mozilla-static,,nsAuthModule
@@ -406,7 +401,6 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {45c23a20-d71c-11d2-8aac-00600811a836},,application/x-mozilla-static,,nsUConvModule
 {a6cf9112-15b3-11d2-932e-00805f8add32},,application/x-mozilla-static,,nsParserModule
 {f916ebfb-78ef-464b-94d0-a6f2ca3200ae},,application/x-mozilla-static,,nsWidgetGtk2Module
-{2d92593e-14d0-48ce-b260-a9881bbf9c8b},,text/javascript,,abs:/home/hitman/Software/firefox-3.6-EPaath/extensions/firebug@software.joehewitt.com/components/firebug-http-observer.js
 {c6e8c44d-9f39-4af7-bcc0-76e38a8310f5},,text/javascript,,rel:nsBrowserGlue.js
 {0e4e7d00-f71a-439f-9178-1a71ff11b55f},,application/x-mozilla-static,,nsLayoutModule
 {7b8556b2-ec79-11d2-8aac-00600811a836},,application/x-mozilla-static,,nsUConvModule
@@ -422,10 +416,9 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {ec693a6f-0832-49dd-877c-89f6552df5de},,application/x-mozilla-static,,NSS
 {dccbe7e4-7750-466b-a557-5ea36c8ff24e},,application/x-mozilla-static,,necko
 {1f59b001-02c9-11d5-ae76-cc92f7db9e03},,application/x-mozilla-static,,embedcomponents
-{18a03189-067b-4978-b4f1-bafe35292ed6},,text/javascript,,rel:txEXSLTRegExFunctions.js
 {ba6151b1-1dfa-11d3-b3bf-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
 {47433d1d-d9a7-4954-994f-f7a05cf87c2e},,application/x-mozilla-static,,nsUConvModule
-{cb9e0de8-3598-4ed7-857b-827f011ad5d8},,text/javascript,,rel:nsLoginManager.js
+{84e11f80-ca55-11dd-ad8b-0800200c9a66},,application/x-mozilla-native,,rel:libmozgnome.so
 {495eca46-0a5c-11d4-a135-005004832142},,application/x-mozilla-static,,nsUConvModule
 {0e6892c1-a9ad-11d2-b3ae-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
 {d4214e93-fb94-11d2-bdd8-00104bde6048},,application/x-mozilla-static,,nsRDFModule
@@ -462,7 +455,6 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {9eb760f0-4380-11d2-b328-00805f8a3859},,application/x-mozilla-static,,nsLayoutModule
 {2e41ada0-62b7-4902-b9a6-e4542aa458ba},,application/x-mozilla-static,,embedcomponents
 {320706d2-2e81-42c6-89c3-8d83b17d3fb4},,application/x-mozilla-static,,necko
-{9589dc0d-9709-4578-883e-d393452b3611},,text/javascript,,abs:/home/hitman/Software/firefox-3.6-EPaath/extensions/firebug@software.joehewitt.com/components/firebug-annotations.js
 {1f5c1721-7dc3-11d3-bf87-00105a1b0627},,application/x-mozilla-static,,nsLayoutModule
 {f1eac761-87e9-11d3-af80-00a024ffc08c},,application/x-mozilla-static,,Browser_Embedding_Module
 {40b22006-5dd5-42f2-bfe7-7dbf0757ab8b},,application/x-mozilla-static,,nsLayoutModule
@@ -496,6 +488,7 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {0fa3158c-d5a7-43de-9181-a285e74cf1d4},,application/x-mozilla-static,,nsUnixProxyModule
 {2002f783-3960-11d3-b3c3-00805f8a6670},,application/x-mozilla-static,,nsChardetModule
 {6ebc941a-f2ff-4d56-b3b6-f7d0b9d73344},,text/javascript,,rel:nsDefaultCLH.js
+{22117140-9c6e-11d3-aaf1-00805f8a4905},,text/javascript,,rel:nsSidebar.js
 {1abdcc96-1dd2-11b2-b520-f8f59cdd67bc},,application/x-mozilla-static,,nsLayoutModule
 {e09af32d-2a54-4d76-9ef0-3070e83f8be7},,application/x-mozilla-static,,nsLayoutModule
 {a665e49a-f3e6-4fed-9f31-f7c568a29899},@mozilla.org/intl/unicodenormalizer;1,application/x-mozilla-static,Unicode Normlization,nsI18nModule
@@ -507,7 +500,6 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {a1fde867-e802-11d4-9885-00c04fa0cf4b},,application/x-mozilla-static,,nsLayoutModule
 {a578e0a3-f76b-11d2-8aac-00600811a836},,application/x-mozilla-static,,nsUConvModule
 {f96f5ec9-755b-447e-b1f3-717d1a84bb41},,application/x-mozilla-static,,nsLayoutModule
-{84e11f80-ca55-11dd-ad8b-0800200c9a66},,application/x-mozilla-native,,rel:libmozgnome.so
 {776588a6-86d5-47e2-b6b3-992810078202},,application/x-mozilla-static,,nsUConvModule
 {f6913e2e-1dd1-11b2-84be-f455dee342af},,application/x-mozilla-static,,necko
 {a6cf9120-15b3-11d2-932e-00805f8add32},,application/x-mozilla-static,,nsI18nModule
@@ -578,11 +570,9 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {e1c61582-2a84-11d3-8cce-0060b0fc14a3},,application/x-mozilla-static,,necko
 {a0f827e2-8ab6-11d5-a14b-005004832142},,application/x-mozilla-static,,nsUConvModule
 {6803cace-1e3b-11d5-a145-005004832142},,application/x-mozilla-static,,nsUConvModule
-{32314cc8-22f7-4f7f-a645-1a45453ba6a6},,text/javascript,,rel:nsHandlerService.js
 {1c31ed79-accd-4b94-b517-06e0c81999d5},,text/javascript,,rel:FeedConverter.js
 {2f977d4f-5485-11d4-87e2-0010a4e75ef2},,application/x-mozilla-static,,nsPrefModule
 {fe74cf80-aa2d-11db-abbd-0800200c9a66},,text/javascript,,rel:fuelApplication.js
-{d2ac51bc-1622-4d4d-85cb-f8e8b5805cb9},,text/javascript,,abs:/home/hitman/Software/firefox-3.6-EPaath/extensions/firebug@software.joehewitt.com/components/firebug-trace-service.js
 {660d8ca9-f763-11d2-8aad-00600811a836},,application/x-mozilla-static,,nsUConvModule
 {6394eebc-fc3d-11d2-b3b8-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
 {7b8556ad-ec79-11d2-8aac-00600811a836},,application/x-mozilla-static,,nsUConvModule
@@ -612,7 +602,7 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {fc2389b8-c650-4093-9e42-b05e5f0685b7},,application/x-mozilla-static,,nsWidgetGtk2Module
 {58a1c31c-1dd2-11b2-a3f6-d36949d48268},,application/x-mozilla-static,,necko
 {c7e410d4-85f2-11d3-9f63-006008a6efe9},,application/x-mozilla-static,,nsJarModule
-{4ca3c946-5408-49f0-9eca-3a97d5c67750},,application/x-mozilla-native,,rel:libbrowsercomps.so
+{18a03189-067b-4978-b4f1-bafe35292ed6},,text/javascript,,rel:txEXSLTRegExFunctions.js
 {7b8556b1-ec79-11d2-8aac-00600811a836},,application/x-mozilla-static,,nsUConvModule
 {7ee2a4c0-4b93-17d3-ba18-0060b0f199a2},@mozilla.org/scriptsecuritymanager;1,application/x-mozilla-static,scriptsecuritymanager,nsSecurityManagerModule
 {ba6151b3-1dfa-11d3-b3bf-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
@@ -666,7 +656,6 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {0a5cd734-eb65-4d14-88a0-9f0bb2aba206},,application/x-mozilla-static,,nsRDFModule
 {749e62f4-60ae-4569-a8a2-de78b649660e},,text/javascript,,rel:nsLoginManagerPrompter.js
 {9a28ffa7-e6ef-4b52-a127-6ad951de8e9b},,application/x-mozilla-native,,rel:libbrowsercomps.so
-{77da64d3-7458-4920-9491-86cc9914f904},,text/javascript,,rel:NetworkGeolocationProvider.js
 {2d96b3df-c051-11d1-a827-0040959a28c9},,application/x-mozilla-static,,nsWidgetGtk2Module
 {a6cf9115-15b3-11d2-932e-00805f8add32},,application/x-mozilla-static,,nsGfxModule
 {5c337258-a580-472e-8615-f277ddc5bb06},,application/x-mozilla-static,,nsWidgetGtk2Module
@@ -682,6 +671,7 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {20557898-1dd2-11b2-8f65-9c462ee2bc95},,application/x-mozilla-static,,nsImageLib2Module
 {2d96b3d1-c051-11d1-a827-0040959a28c9},,application/x-mozilla-static,,nsWidgetGtk2Module
 {13111d00-ce81-11d6-8082-ecf3665af67c},,application/x-mozilla-static,,nsLayoutModule
+{c64d0bcb-8270-4ca7-a0b3-3380c8ffecb5},,text/javascript,,rel:nsSafebrowsingApplication.js
 {bc26ff01-f2bd-11d4-a73c-e5a4b5a8bdfc},,application/x-mozilla-static,,nsComposerModule
 {7dfdf0d1-aff6-4a34-bad1-d0fe74601642},,text/javascript,,rel:nsDownloadManagerUI.js
 {ba6151b8-1dfa-11d3-b3bf-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
@@ -704,7 +694,6 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {c375fa80-150f-11d6-a618-0010a401eb10},,application/x-mozilla-static,,necko
 {660d8ca3-f763-11d2-8aad-00600811a836},,application/x-mozilla-static,,nsUConvModule
 {d750a964-2d14-484c-b3aa-8ed7823b5c7b},,application/x-mozilla-static,,nsLayoutModule
-{f57899d0-4e2c-4ac6-9e29-50c736103b0c},,text/javascript,,rel:nsSetDefaultBrowser.js
 {786e0a0e-e035-4600-8ee0-365a63a80b80},,application/x-mozilla-static,,nsToolkitCompsModule
 {b0ff4572-dae4-4bef-a092-83c1b88f6be9},@mozilla.org/network/dns-service;1,application/x-mozilla-static,nsDNSService,necko
 {bbc23860-2553-479d-8b78-94d9038334f7},,text/javascript,,rel:nsTaggingService.js
@@ -731,13 +720,14 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {e11a6080-4daa-11d2-b328-00805f8a3859},,application/x-mozilla-static,,nsLayoutModule
 {7e6e57c0-e2f2-11d3-b32f-004005a7a7e4},,application/x-mozilla-static,,nsUCvMathModule
 {ea06d4e3-2b3d-11d3-b3bf-00805f8a6670},,application/x-mozilla-static,,nsUniversalCharDetModule
+{5d0cfa97-69dd-4e5e-ac84-f253162e8f9a},,text/javascript,,rel:FeedProcessor.js
 {5871a422-1dd2-11b2-ab3f-e2e56be5da9c},,application/x-mozilla-static,,nsImageLib2Module
 {15629ada-a41c-4a09-961f-6553cd60b1a2},,application/x-mozilla-static,,necko
 {e197cc01-cfe1-11d4-8eb0-87ae406dfd3f},,application/x-mozilla-static,,nsLayoutModule
 {2ea2e7d0-4095-11d3-9144-006008a6edf6},,application/x-mozilla-static,,nsI18nModule
 {dd156d62-d26f-4441-9cdb-e8f09107c273},,application/x-mozilla-static,,nsSecurityManagerModule
 {6394eeb1-fc3d-11d2-b3b8-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
-{c272fee0-c7e9-11d3-8cda-0060b0fc14a3},@mozilla.org/network/file-output-stream;1,application/x-mozilla-static,nsFileOutputStream,necko
+{c272fee0-c7e9-11d3-8cda-0060b0fc14a3},,application/x-mozilla-static,,necko
 {96ec4163-efc8-407a-8735-007fb26be4e8},,application/x-mozilla-static,,nsAuthModule
 {e38e53b9-5bb0-456a-b553-579370cb1567},,application/x-mozilla-static,,xpconnect
 {a6cf90e3-15b3-11d2-932e-00805f8add32},,application/x-mozilla-static,,nsLayoutModule
@@ -782,11 +772,11 @@ rel:nsPlacesAutoComplete.js,1263595301000
 {aa13e4a0-a5ac-11d2-9119-006008a6edf6},,application/x-mozilla-static,,nsI18nModule
 {7c657d17-ec5e-11d2-8aac-00600811a836},,application/x-mozilla-static,,nsUConvModule
 {6394eea9-fc3d-11d2-b3b8-00805f8a6670},,application/x-mozilla-static,,nsUConvModule
-{229fa115-9412-4d32-baf3-2fc407f76fb1},,text/javascript,,rel:FeedConverter.js
 {66354bc9-7ed1-4692-ae1d-8da97d6b205e},,text/javascript,,rel:nsBlocklistService.js
 {171e72db-0f8a-412a-8461-e4c927a3a2ac},,application/x-mozilla-static,,nsComposerModule
 {ef565d0a-ab9a-4a13-9160-0644cdfd859a},,application/x-mozilla-static,,nsCookieModule
 {735959a1-af01-447e-b02d-56e968fa52b4},,application/x-mozilla-static,,NSS
+{cb9e0de8-3598-4ed7-857b-827f011ad5d8},,text/javascript,,rel:nsLoginManager.js
 {5e8d4751-1852-434b-a992-2c6d2a25fa46},,application/x-mozilla-static,,nsPlacesModule
 {ecd55a01-2780-11d5-a73c-ca641a6813bc},,application/x-mozilla-static,,embedcomponents
 {2002f782-3960-11d3-b3c3-00805f8a6670},,application/x-mozilla-static,,nsChardetModule
@@ -958,7 +948,6 @@ rel:nsPlacesAutoComplete.js,1263595301000
 @mozilla.org/url-classifier/utils;1,{b7b2ccec-7912-4ea6-a548-b038447004bd}
 @mozilla.org/intl/unicode/encoder;1?charset=windows-936,{9416bfc1-1f93-11d3-b3bf-00805f8a6670}
 @mozilla.org/editor/txtsrvfilter;1,{171e72db-0f8a-412a-8461-e4c927a3a2ac}
-@joehewitt.com/firebug-http-observer;1,{2d92593e-14d0-48ce-b260-a9881bbf9c8b}
 @mozilla.org/nsDOMCryptoDialogs;1,{518e071f-1dd2-11b2-937e-c45f14def778}
 @mozilla.org/intl/unicode/decoder;1?charset=armscii-8,{6394eeac-fc3d-11d2-b3b8-00805f8a6670}
 @mozilla.org/jsctypes;1,{0c797702-1c60-4051-9dd7-4d7405605642}
@@ -1088,7 +1077,6 @@ rel:nsPlacesAutoComplete.js,1263595301000
 @mozilla.org/layout/contentserializer;1?mimetype=application/xhtml+xml,{e7c2aaf5-c11a-4954-9dbf-e28edec1fd91}
 @mozilla.org/appshell/appShellService;1,{0099907d-123c-4853-a46a-43098b5fb68c}
 @mozilla.org/network/protocol/about;1?what=mozilla,{f0acde16-1dd1-11b2-9e35-f5786fff5a66}
-@joehewitt.com/firebug-channel-listener;1,{5aaeb534-fa57-488d-9a73-20c258fc7bdb}
 @mozilla.org/js/jsd/app-start-observer;2,{2fd6b7f6-eb8c-4f32-ad26-113f2c02d0fe}
 @mozilla.org/network/protocol/about;1?what=plugins,{f0acde16-1dd1-11b2-9e35-f5786fff5a66}
 @mozilla.org/intl/unicharutil;1,{cc10c750-9ec3-11d2-b3ae-00805f8a6670}
@@ -1116,6 +1104,7 @@ rel:nsPlacesAutoComplete.js,1263595301000
 @mozilla.org/layout/contentserializer;1?mimetype=text/plain,{6030f7ef-32ed-46a7-9a63-6a5d3f90445f}
 @mozilla.org/inspector/dom-view;1,{fb5c1775-1bbd-4b9c-abb0-ae7acd29e87e}
 @mozilla.org/embeddor.implemented/web-content-handler-registrar;1,{792a7e82-06a0-437c-af63-b2d12e808acc}
+@mozilla.org/uriloader/content-handler;1?type=image/gif,{5d0ce354-df01-421a-83fb-7ead0990c24e}
 @mozilla.org/offlinecacheupdate;1,{e56f5e01-c7cc-4675-a9d7-b8f1e4127295}
 @mozilla.org/geolocation;1,{01e1c3ff-094a-d048-44b4-62d29c7b4f39}
 @mozilla.org/embedcomp/controller-command-table;1,{670ee5da-6ad5-11d7-9950-000393636592}
@@ -1217,7 +1206,6 @@ rel:nsPlacesAutoComplete.js,1263595301000
 @mozilla.org/widget/native-key-bindings;1?type=editor,{f916ebfb-78ef-464b-94d0-a6f2ca3200ae}
 @mozilla.org/js/xpc/ContextStackIterator;1,{05bae29d-8aef-486d-84aa-53f48f146811}
 @mozilla.org/browser/session-history-entry;1,{bfd1a791-ad9f-11d3-bdc7-0050040a9b44}
-@joehewitt.com/firebug;1,{a380e9c0-cb39-11da-a94d-0800200c9a66}
 @mozilla.org/feed-result;1,{072a5c3d-30c6-4f07-b87f-9f63d51403f2}
 @mozilla.org/userinfo;1,{14c13684-1dd2-11b2-9463-bb10ba742554}
 @mozilla.org/xpfe/http-index-format-factory-constructor,{82776710-5690-11d3-be36-00104bde6048}
@@ -1233,7 +1221,7 @@ rel:nsPlacesAutoComplete.js,1263595301000
 @mozilla.org/nsCMSSecureMessage;1,{5fb907e0-1dd2-11b2-a7c0-f14c416a62a1}
 @mozilla.org/embedding/browser/nsWebBrowserPersist;1,{7e677795-c582-4cd1-9e8d-8271b3474d2a}
 @mozilla.org/toolkit/remote-service;1,{c0773e90-5799-4eff-ad03-3ebcd85624ac}
-@mozilla.org/uriloader/content-handler;1?type=image/gif,{5d0ce354-df01-421a-83fb-7ead0990c24e}
+@mozilla.org/exslt/regexp;1,{18a03189-067b-4978-b4f1-bafe35292ed6}
 @mozilla.org/intl/stringbundle;1,{d85a17c1-aa7c-11d2-9b8c-00805f8a16d9}
 @mozilla.org/user_cert_picker;1,{735959a1-af01-447e-b02d-56e968fa52b4}
 @mozilla.org/browser/shistory;1,{7294fe9c-14d8-11d5-9882-00c04fa02f40}
@@ -1449,13 +1437,11 @@ rel:nsPlacesAutoComplete.js,1263595301000
 @mozilla.org/content-pref/service;1,{e6a3f533-4ffa-4615-8eb4-d4e72d883fa7}
 @mozilla.org/url-classifier/dbservice;1,{5eb7c3c1-ec1f-4007-87cc-eefb37d68ce6}
 @mozilla.org/intl/unicode/decoder;1?charset=IBM862,{2d524fd4-ae74-11d3-abf7-0004aceefa51}
-@mozilla.org/exslt/regexp;1,{18a03189-067b-4978-b4f1-bafe35292ed6}
 @mozilla.org/document-transformer;1?type=xslt,{bacd8ad0-552f-11d3-a9f7-000064657374}
 @mozilla.org/image/decoder;2?type=image/vnd.microsoft.icon,{cb3ede1a-0fa5-4e27-aafe-0f7801e5a1f1}
 @mozilla.org/intl/unicode/decoder;1?charset=ISO-IR-111,{9416bfb1-1f93-11d3-b3bf-00805f8a6670}
 @mozilla.org/editor/htmleditor;1,{ed0244e0-c144-11d2-8f4c-006008159b0c}
 @mozilla.org/network/http-auth-manager;1,{36b63ef3-e0fa-4c49-9fd4-e065e85568f4}
-@joehewitt.com/firebug-trace-service;1,{d2ac51bc-1622-4d4d-85cb-f8e8b5805cb9}
 @mozilla.org/xul/xul-document;1,{541afcb2-a9a3-11d2-8ec5-00805f29f370}
 @mozilla.org/url-classifier/jslib;1,{26a4a019-2827-4a89-a85c-5931a678823a}
 @mozilla.org/saxparser/attributes;1,{7bb40992-77eb-43db-9a4e-39d3bcc383ae}
@@ -1549,7 +1535,6 @@ rel:nsPlacesAutoComplete.js,1263595301000
 @mozilla.org/intl/unicode/encoder;1?charset=ISO-8859-9,{7b8556a9-ec79-11d2-8aac-00600811a836}
 @mozilla.org/intl/unicode/encoder;1?charset=x-ttf-cmr,{67671792-8e25-4487-b1b7-5073cfa95fee}
 @mozilla.org/nsCMSMessage;1,{a4557478-ae16-11d5-ba4b-00108303b117}
-@joehewitt.com/firebug-annotation-service;1,{9589dc0d-9709-4578-883e-d393452b3611}
 @mozilla.org/content/dom-selection;1,{c87a37fc-8109-4ce2-a322-8cdec925379f}
 @mozilla.org/network/protocol/about;1?what=crashes,{f0acde16-1dd1-11b2-9e35-f5786fff5a66}
 @mozilla.org/intl/unicode/decoder;1?charset=ISO-2022-KR,{ba61519f-1dfa-11d3-b3bf-00805f8a6670}
@@ -1759,17 +1744,11 @@ JavaScript global constructor,BrowserFeedWriter,@mozilla.org/browser/feeds/resul
 JavaScript global constructor,Image,@mozilla.org/content/element/html;1?name=img
 JavaScript global constructor,Audio,@mozilla.org/content/element/html;1?name=audio
 JavaScript global constructor,Option,@mozilla.org/content/element/html;1?name=option
+agent-style-sheets,pluginfinder xbl binding,chrome://ubufox/content/alternatePluginsBinding.css
 xpcom-directory-providers,spellcheck-directory-provider,@mozilla.org/spellcheck/dir-provider;1
 xpcom-directory-providers,browser-directory-provider,@mozilla.org/browser/directory-provider;1
-external-uricontentlisteners,application/x-x509-user-cert,@mozilla.org/uriloader/psm-external-content-listener;1
-external-uricontentlisteners,application/x-x509-email-cert,@mozilla.org/uriloader/psm-external-content-listener;1
-external-uricontentlisteners,application/x-x509-crl,@mozilla.org/uriloader/psm-external-content-listener;1
-external-uricontentlisteners,application/pkix-crl,@mozilla.org/uriloader/psm-external-content-listener;1
-external-uricontentlisteners,application/x-pkcs7-crl,@mozilla.org/uriloader/psm-external-content-listener;1
-external-uricontentlisteners,application/x-x509-ca-cert,@mozilla.org/uriloader/psm-external-content-listener;1
-external-uricontentlisteners,application/x-x509-server-cert,@mozilla.org/uriloader/psm-external-content-listener;1
 uconv-charset-titles,chrome://global/locale/charsetTitles.properties,
-uconv-charset-data,resource://gre/res/charsetData.properties,
+pref-config-startup,ReadConfig Module,@mozilla.org/readconfig;1
 command-line-handler,x-default,@mozilla.org/browser/final-clh;1
 command-line-handler,m-privatebrowsing,@mozilla.org/privatebrowsing;1
 command-line-handler,b-jsconsole,@mozilla.org/toolkit/console-clh;1
@@ -1794,7 +1773,7 @@ content-policy,@mozilla.org/embedding/browser/content-policy;1,@mozilla.org/embe
 @mozilla.org/streamconv;1,?from=text/ftp-dir&to=application/http-index-format,
 @mozilla.org/streamconv;1,?from=x-gzip&to=uncompressed,
 @mozilla.org/streamconv;1,?from=multipart/byteranges&to=*/*,
-pref-config-startup,ReadConfig Module,@mozilla.org/readconfig;1
+XSLT extension functions,http://exslt.org/regular-expressions,@mozilla.org/exslt/regexp;1
 charset-detectors,cjk_parallel_state_machine,@mozilla.org/intl/charsetdetect;1?type=cjk_parallel_state_machine
 charset-detectors,ko_parallel_state_machine,@mozilla.org/intl/charsetdetect;1?type=ko_parallel_state_machine
 charset-detectors,ruprob,@mozilla.org/intl/charsetdetect;1?type=ruprob
@@ -1809,10 +1788,6 @@ JavaScript global property,InstallTrigger,@mozilla.org/xpinstall/installtrigger;
 JavaScript global property,external,@mozilla.org/sidebar;1
 JavaScript global property,sidebar,@mozilla.org/sidebar;1
 command-line-validator,b-browser,@mozilla.org/browser/clh;1
-parser-service-category,Meta Charset Service,@mozilla.org/intl/metacharset;1
-profile-after-change,Timer Manager,@mozilla.org/updates/timer-manager;1
-profile-after-change,Extension Manager,@mozilla.org/extensions/manager;1
-profile-after-change,Update Service Stub,@mozilla.org/updates/update-service-stub;1
 Gecko-Content-Viewers,application/xml,@mozilla.org/content/document-loader-factory;1
 Gecko-Content-Viewers,application/x-javascript,@mozilla.org/content/document-loader-factory;1
 Gecko-Content-Viewers,application/javascript,@mozilla.org/content/document-loader-factory;1
@@ -1841,29 +1816,9 @@ Gecko-Content-Viewers,application/vnd.mozilla.xul+xml,@mozilla.org/content/docum
 Gecko-Content-Viewers,text/xml,@mozilla.org/content/document-loader-factory;1
 Gecko-Content-Viewers,image/vnd.microsoft.icon,@mozilla.org/content/document-loader-factory;1
 Gecko-Content-Viewers,image/x-ms-bmp,@mozilla.org/content/document-loader-factory;1
-agent-style-sheets,pluginfinder xbl binding,chrome://ubufox/content/alternatePluginsBinding.css
-geolocation-provider,Returns a geolocation from a GPSD source,@mozilla.org/geolocation/gpsd/provider;1
-JavaScript global constructor prototype alias,Image,HTMLImageElement
-JavaScript global constructor prototype alias,Audio,HTMLAudioElement
-JavaScript global constructor prototype alias,Option,HTMLOptionElement
-module-loader,text/javascript,@mozilla.org/moz/jsloader;1
-app-startup,PrivateBrowsing Service,service,@mozilla.org/privatebrowsing;1
-app-startup,tryToClose Service,service,@mozilla.org/appshell/trytoclose;1
-app-startup,Web Content Handler Registrar,service,@mozilla.org/embeddor.implemented/web-content-handler-registrar;1
-app-startup,Application,service,@mozilla.org/fuel/application;1
-app-startup,Window Data Source,service,@mozilla.org/rdf/datasource;1?name=window-mediator
-app-startup,Firefox Browser Glue Service,service,@mozilla.org/browser/browserglue;1
-app-startup,Browser Session Startup Service,service,@mozilla.org/browser/sessionstartup;1
-app-startup,SystemPref Module,@mozilla.org/system-preferences;1
-app-startup,Script Security Manager,service,@mozilla.org/scriptsecuritymanager;1
-bookmark-observers,Used to synchronize the temporary and permanent tables of Places,@mozilla.org/places/sync;1
-JavaScript global privileged property,Application,@mozilla.org/fuel/application;1
-update-timer,Extension Manager,@mozilla.org/extensions/manager;1,getService,addon-background-update-timer,extensions.update.interval,86400
-update-timer,Microsummary Service,@mozilla.org/microsummary/service;1,getService,microsummary-generator-update-timer,browser.microsummary.generatorUpdateInterval,604800
-update-timer,Update Service,@mozilla.org/updates/update-service;1,getService,background-update-timer,app.update.interval,86400
-update-timer,Blocklist Service,@mozilla.org/extensions/blocklist;1,getService,blocklist-background-update-timer,extensions.blocklist.interval,86400
-XSLT extension functions,http://exslt.org/regular-expressions,@mozilla.org/exslt/regexp;1
-history-observers,Used to synchronize the temporary and permanent tables of Places,@mozilla.org/places/sync;1
+profile-after-change,Timer Manager,@mozilla.org/updates/timer-manager;1
+profile-after-change,Extension Manager,@mozilla.org/extensions/manager;1
+profile-after-change,Update Service Stub,@mozilla.org/updates/update-service-stub;1
 Charset Decoders,UTF-16,
 Charset Decoders,ISO-8859-8-E,
 Charset Decoders,ISO-8859-4,
@@ -1952,3 +1907,33 @@ Charset Decoders,windows-936,
 Charset Decoders,windows-1254,
 Charset Decoders,IBM855,
 Charset Decoders,x-viet-vps,
+geolocation-provider,Returns a geolocation from a GPSD source,@mozilla.org/geolocation/gpsd/provider;1
+JavaScript global constructor prototype alias,Image,HTMLImageElement
+JavaScript global constructor prototype alias,Audio,HTMLAudioElement
+JavaScript global constructor prototype alias,Option,HTMLOptionElement
+module-loader,text/javascript,@mozilla.org/moz/jsloader;1
+app-startup,tryToClose Service,service,@mozilla.org/appshell/trytoclose;1
+app-startup,Web Content Handler Registrar,service,@mozilla.org/embeddor.implemented/web-content-handler-registrar;1
+app-startup,PrivateBrowsing Service,service,@mozilla.org/privatebrowsing;1
+app-startup,Window Data Source,service,@mozilla.org/rdf/datasource;1?name=window-mediator
+app-startup,Firefox Browser Glue Service,service,@mozilla.org/browser/browserglue;1
+app-startup,Browser Session Startup Service,service,@mozilla.org/browser/sessionstartup;1
+app-startup,Application,service,@mozilla.org/fuel/application;1
+app-startup,SystemPref Module,@mozilla.org/system-preferences;1
+app-startup,Script Security Manager,service,@mozilla.org/scriptsecuritymanager;1
+bookmark-observers,Used to synchronize the temporary and permanent tables of Places,@mozilla.org/places/sync;1
+uconv-charset-data,resource://gre/res/charsetData.properties,
+external-uricontentlisteners,application/x-x509-user-cert,@mozilla.org/uriloader/psm-external-content-listener;1
+external-uricontentlisteners,application/x-x509-email-cert,@mozilla.org/uriloader/psm-external-content-listener;1
+external-uricontentlisteners,application/x-x509-crl,@mozilla.org/uriloader/psm-external-content-listener;1
+external-uricontentlisteners,application/pkix-crl,@mozilla.org/uriloader/psm-external-content-listener;1
+external-uricontentlisteners,application/x-pkcs7-crl,@mozilla.org/uriloader/psm-external-content-listener;1
+external-uricontentlisteners,application/x-x509-ca-cert,@mozilla.org/uriloader/psm-external-content-listener;1
+external-uricontentlisteners,application/x-x509-server-cert,@mozilla.org/uriloader/psm-external-content-listener;1
+JavaScript global privileged property,Application,@mozilla.org/fuel/application;1
+update-timer,Extension Manager,@mozilla.org/extensions/manager;1,getService,addon-background-update-timer,extensions.update.interval,86400
+update-timer,Microsummary Service,@mozilla.org/microsummary/service;1,getService,microsummary-generator-update-timer,browser.microsummary.generatorUpdateInterval,604800
+update-timer,Update Service,@mozilla.org/updates/update-service;1,getService,background-update-timer,app.update.interval,86400
+update-timer,Blocklist Service,@mozilla.org/extensions/blocklist;1,getService,blocklist-background-update-timer,extensions.blocklist.interval,86400
+parser-service-category,Meta Charset Service,@mozilla.org/intl/metacharset;1
+history-observers,Used to synchronize the temporary and permanent tables of Places,@mozilla.org/places/sync;1
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/cookies.sqlite b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/cookies.sqlite
index 7fcaf66..b7b48af 100755
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/cookies.sqlite
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/cookies.sqlite
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/cookies.sqlite-journal b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/cookies.sqlite-journal
deleted file mode 100644
index 426b72f..0000000
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/cookies.sqlite-journal
+++ /dev/null
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.cache b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.cache
index 17afc07..249f443 100755
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.cache
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.cache
@@ -1,5 +1,5 @@
-app-global	{972ce4c6-7e08-4474-a285-3208198ce6fd}	rel%{972ce4c6-7e08-4474-a285-3208198ce6fd}	1263595302	

-app-global	firebug@software.joehewitt.com	rel%firebug@software.joehewitt.com	1264417256	

-app-profile	{4D498D0A-05AD-4fdb-97B5-8A0AABC1FC5B}	rel%{4D498D0A-05AD-4fdb-97B5-8A0AABC1FC5B}	1264424638	

+app-global	{972ce4c6-7e08-4474-a285-3208198ce6fd}	rel%{972ce4c6-7e08-4474-a285-3208198ce6fd}	1266149691	

+app-profile	{4D498D0A-05AD-4fdb-97B5-8A0AABC1FC5B}	rel%{4D498D0A-05AD-4fdb-97B5-8A0AABC1FC5B}	1266138681	

 app-system-local	ubufox@ubuntu.com	rel%ubufox@ubuntu.com	1256764772	

 app-system-local	netbook-webfav@ubuntu.com	rel%netbook-webfav@ubuntu.com	1256764774	

+app-system-local	{c45c406e-ab73-11d8-be73-000a95be3b12}	rel%{c45c406e-ab73-11d8-be73-000a95be3b12}	1265727663	

diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.ini b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.ini
index 46b8dc4..c1d9b3d 100644
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.ini
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.ini
@@ -1,6 +1,5 @@
 [ExtensionDirs]

-Extension0=/home/hitman/Software/firefox-3.6-EPaath/.mozilla/firefox/ukm0hbpm.default/extensions/{4D498D0A-05AD-4fdb-97B5-8A0AABC1FC5B}

-Extension1=/home/hitman/Software/firefox-3.6-EPaath/extensions/firebug@software.joehewitt.com

-Extension2=/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/ubufox@ubuntu.com

+Extension0=/home/hitman/karma/mainline/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions/{4D498D0A-05AD-4fdb-97B5-8A0AABC1FC5B}

+Extension1=/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/ubufox@ubuntu.com

 [ThemeDirs]

-Extension0=/home/hitman/Software/firefox-3.6-EPaath/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}

+Extension0=/home/hitman/karma/mainline/tools/xo_bundle/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}

diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.log b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.log
index f250c72..1e347ef 100644
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.log
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.log
@@ -1 +1,2 @@
 2010-01-25 18:29:26 - ExtensionManager:_finishOperations - failure, catching exception - lineno: 3046 - file: undefined - [Exception... "Component returned failure code: 0x8000ffff (NS_ERROR_UNEXPECTED) [nsIPrefBranch2.setCharPref]"  nsresult: "0x8000ffff (NS_ERROR_UNEXPECTED)"  location: "JS frame :: file:///home/hitman/Software/firefox-3.6-EPaath/components/nsExtensionManager.js :: EM__finishOperations :: line 3046"  data: no]
+2010-02-23 16:19:44 - ExtensionManager:_finishOperations - failure, catching exception - lineno: 3046 - file: undefined - [Exception... "Component returned failure code: 0x8000ffff (NS_ERROR_UNEXPECTED) [nsIPrefBranch2.setCharPref]"  nsresult: "0x8000ffff (NS_ERROR_UNEXPECTED)"  location: "JS frame :: file:///home/hitman/karma/mainline/tools/xo_bundle/components/nsExtensionManager.js :: EM__finishOperations :: line 3046"  data: no]
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.rdf b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.rdf
index 4860afe..e4a5d33 100755
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.rdf
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/extensions.rdf
@@ -2,25 +2,28 @@
 <RDF:RDF xmlns:NS1="http://www.mozilla.org/2004/em-rdf#"
          xmlns:NC="http://home.netscape.com/NC-rdf#"
          xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="urn:mozilla:item:{4D498D0A-05AD-4fdb-97B5-8A0AABC1FC5B}"
-                   NS1:installLocation="app-profile"
-                   NS1:version="0.7.2"
-                   NS1:name="R-kiosk"
-                   NS1:description="RKiosk (Real Kiosk), fullscreen kiosk mode: all menus, keys etc. disabled"
-                   NS1:creator="Kimmo Heinaaro">
-    <NS1:type NC:parseType="Integer">2</NS1:type>
-    <NS1:targetApplication RDF:resource="rdf:#$wqvFL3"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="rdf:#$wqvFL3"
+  <RDF:Description RDF:about="rdf:#$cGs8p"
+                   NS1:id="{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}"
+                   NS1:minVersion="1.0"
+                   NS1:maxVersion="1.1.*" />
+  <RDF:Description RDF:about="rdf:#$mFs8p"
                    NS1:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
                    NS1:minVersion="2.0"
                    NS1:maxVersion="3.*" />
+  <RDF:Description RDF:about="rdf:#$9Fs8p"
+                   NS1:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
+                   NS1:minVersion="3.6"
+                   NS1:maxVersion="3.6" />
+  <RDF:Description RDF:about="rdf:#$bGs8p"
+                   NS1:id="{a463f10c-3994-11da-9945-000d60ca027b}"
+                   NS1:minVersion="1.0"
+                   NS1:maxVersion="2.0.*" />
   <RDF:Seq RDF:about="urn:mozilla:item:root">
     <RDF:li RDF:resource="urn:mozilla:item:{972ce4c6-7e08-4474-a285-3208198ce6fd}"/>
     <RDF:li RDF:resource="urn:mozilla:item:{4D498D0A-05AD-4fdb-97B5-8A0AABC1FC5B}"/>
-    <RDF:li RDF:resource="urn:mozilla:item:firebug@software.joehewitt.com"/>
     <RDF:li RDF:resource="urn:mozilla:item:ubufox@ubuntu.com"/>
     <RDF:li RDF:resource="urn:mozilla:item:netbook-webfav@ubuntu.com"/>
+    <RDF:li RDF:resource="urn:mozilla:item:{c45c406e-ab73-11d8-be73-000a95be3b12}"/>
   </RDF:Seq>
   <RDF:Description RDF:about="urn:mozilla:item:{972ce4c6-7e08-4474-a285-3208198ce6fd}"
                    NS1:installLocation="app-global"
@@ -33,7 +36,20 @@
                    NS1:creator="Mozilla"
                    NS1:contributor="Mozilla Contributors">
     <NS1:type NC:parseType="Integer">4</NS1:type>
-    <NS1:targetApplication RDF:resource="rdf:#$.8Rz72"/>
+    <NS1:targetApplication RDF:resource="rdf:#$9Fs8p"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="rdf:#$aGs8p"
+                   NS1:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
+                   NS1:minVersion="1.0"
+                   NS1:maxVersion="3.5.*" />
+  <RDF:Description RDF:about="urn:mozilla:item:{4D498D0A-05AD-4fdb-97B5-8A0AABC1FC5B}"
+                   NS1:installLocation="app-profile"
+                   NS1:version="0.7.2"
+                   NS1:name="R-kiosk"
+                   NS1:description="RKiosk (Real Kiosk), fullscreen kiosk mode: all menus, keys etc. disabled"
+                   NS1:creator="Kimmo Heinaaro">
+    <NS1:type NC:parseType="Integer">2</NS1:type>
+    <NS1:targetApplication RDF:resource="rdf:#$mFs8p"/>
   </RDF:Description>
   <RDF:Description RDF:about="urn:mozilla:item:netbook-webfav@ubuntu.com"
                    NS1:installLocation="app-system-local"
@@ -47,52 +63,10 @@
     <NS1:type NC:parseType="Integer">2</NS1:type>
     <NS1:targetApplication RDF:resource="rdf:#$N7Rz72"/>
   </RDF:Description>
-  <RDF:Description RDF:about="urn:mozilla:item:firebug@software.joehewitt.com"
-                   NS1:installLocation="app-global"
-                   NS1:version="1.4.5"
-                   NS1:iconURL="chrome://firebug/content/firebug.png"
-                   NS1:name="Firebug"
-                   NS1:description="Web Development Evolved."
-                   NS1:creator="Joe Hewitt"
-                   NS1:homepageURL="http://www.getfirebug.com/">
-    <NS1:type NC:parseType="Integer">2</NS1:type>
-    <NS1:translator>Leszek(teo)Życzkowski (pl-PL)</NS1:translator>
-    <NS1:translator>markh (nl-NL)</NS1:translator>
-    <NS1:translator>peter3 (sv-SE)</NS1:translator>
-    <NS1:translator>AlleyKat (da-DK)</NS1:translator>
-    <NS1:translator>lovelywcm (zh-CN)</NS1:translator>
-    <NS1:translator>Lukáš Kucharczyk, Michal Kec (cs-CZ)</NS1:translator>
-    <NS1:translator>Team erweiterungen.de, ReinekeFux, Benedikt Langens (de-DE)</NS1:translator>
-    <NS1:translator>l0stintranslation, gonzalopirobutirro (it-IT)</NS1:translator>
-    <NS1:translator>alexxed (ro-RO)</NS1:translator>
-    <NS1:translator>Nicolas Martin, Franck Marcia (fr-FR)</NS1:translator>
-    <NS1:translator>gLes (hu-HU)</NS1:translator>
-    <NS1:translator>Xavi Ivars - Softcatalà (ca)</NS1:translator>
-    <NS1:translator>gezmen (tr-TR)</NS1:translator>
-    <NS1:translator>eternoendless (es-AR)</NS1:translator>
-    <NS1:translator>Dark Preacher (ru-RU)</NS1:translator>
-    <NS1:translator>Tiago Oliveira, Diego de Carvalho Zimmermann, Alexandre Rapaki (pt-BR)</NS1:translator>
-    <NS1:translator>Juan Botías (es-ES)</NS1:translator>
-    <NS1:translator>Andriy Zhouck (uk-UA)</NS1:translator>
-    <NS1:translator>Hisateru Tanaka (ja-JP)</NS1:translator>
-    <NS1:contributor>John J. Barton (IBM Almaden)</NS1:contributor>
-    <NS1:contributor>Jan Odvarko (All Peers Inc.)</NS1:contributor>
-    <NS1:contributor>Max Stepanov (Aptana Inc.)</NS1:contributor>
-    <NS1:contributor>Rob Campbell (Mozilla Corp.)</NS1:contributor>
-    <NS1:contributor>Hans Hillen, (Paciello Group, Mozilla)</NS1:contributor>
-    <NS1:contributor>Curtis Bartley, (Mozilla Corp.)</NS1:contributor>
-    <NS1:contributor>Mike Collins, (IBM Almaden)</NS1:contributor>
-    <NS1:contributor>Kevin Decker</NS1:contributor>
-    <NS1:contributor>Mike Ratcliffe, (Comartis AG)</NS1:contributor>
-    <NS1:contributor>Hernan Rodríguez Colmeiro</NS1:contributor>
-    <NS1:contributor>Austin Andrews</NS1:contributor>
-    <NS1:contributor>Christoph Dorn</NS1:contributor>
-    <NS1:targetApplication RDF:resource="rdf:#$L8Rz72"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="rdf:#$.8Rz72"
+  <RDF:Description RDF:about="rdf:#$28Rz72"
                    NS1:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-                   NS1:minVersion="3.6"
-                   NS1:maxVersion="3.6" />
+                   NS1:minVersion="1.5"
+                   NS1:maxVersion="3.7.*" />
   <RDF:Description RDF:about="urn:mozilla:item:ubufox@ubuntu.com"
                    NS1:installLocation="app-system-local"
                    NS1:version="0.8"
@@ -108,16 +82,24 @@
     <NS1:contributor>Saïvann Carignan &lt;oxmosys@gmail.com&gt;</NS1:contributor>
     <NS1:targetApplication RDF:resource="rdf:#$28Rz72"/>
   </RDF:Description>
-  <RDF:Description RDF:about="rdf:#$L8Rz72"
-                   NS1:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-                   NS1:minVersion="3.0"
-                   NS1:maxVersion="3.6.*" />
+  <RDF:Description RDF:about="urn:mozilla:item:{c45c406e-ab73-11d8-be73-000a95be3b12}"
+                   NS1:installLocation="app-system-local"
+                   NS1:version="1.1.8"
+                   NS1:optionsURL="chrome://webdeveloper/content/options/options.xul"
+                   NS1:aboutURL="chrome://webdeveloper/content/about/about.xul"
+                   NS1:iconURL="chrome://webdeveloper/content/images/logo/large.png"
+                   NS1:name="Web Developer"
+                   NS1:description="Adds a menu and a toolbar with various web developer tools."
+                   NS1:creator="Chris Pederick"
+                   NS1:homepageURL="http://chrispederick.com/work/web-developer/"
+                   NS1:appDisabled="true">
+    <NS1:type NC:parseType="Integer">2</NS1:type>
+    <NS1:targetApplication RDF:resource="rdf:#$aGs8p"/>
+    <NS1:targetApplication RDF:resource="rdf:#$bGs8p"/>
+    <NS1:targetApplication RDF:resource="rdf:#$cGs8p"/>
+  </RDF:Description>
   <RDF:Description RDF:about="rdf:#$N7Rz72"
                    NS1:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
                    NS1:minVersion="1.0"
                    NS1:maxVersion="3.5.*" />
-  <RDF:Description RDF:about="rdf:#$28Rz72"
-                   NS1:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
-                   NS1:minVersion="1.5"
-                   NS1:maxVersion="3.7.*" />
 </RDF:RDF>
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/localstore.rdf b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/localstore.rdf
index 4be82a7..47761a3 100755
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/localstore.rdf
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/localstore.rdf
@@ -1,10 +1,8 @@
 <?xml version="1.0"?>
 <RDF:RDF xmlns:NC="http://home.netscape.com/NC-rdf#"
          xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
-  <RDF:Description RDF:about="rdf:#$FvPhC3"
-                   NC:open="true" />
-  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#Description"
-                   ordinal="7" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#status-bar"
+                   hidden="true" />
   <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul">
     <NC:persist RDF:resource="chrome://mozapps/content/extensions/extensions.xul#search-view"/>
     <NC:persist RDF:resource="chrome://mozapps/content/extensions/extensions.xul#extensions-view"/>
@@ -13,62 +11,107 @@
     <NC:persist RDF:resource="chrome://mozapps/content/extensions/extensions.xul#plugins-view"/>
     <NC:persist RDF:resource="chrome://mozapps/content/extensions/extensions.xul#searchbox"/>
   </RDF:Description>
+  <RDF:Description RDF:about="rdf:#$ZvPhC3"
+                   NC:open="true" />
+  <RDF:Description RDF:about="chrome://browser/content/preferences/securityWarnings.xul">
+    <NC:persist RDF:resource="chrome://browser/content/preferences/securityWarnings.xul#SecurityWarnings"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#bookmarks-view"
+                   colinfo=" col:Name?width=&amp;hidden=&amp;ordinal=1 col:URL?width=&amp;hidden=&amp;ordinal=3 col:ShortcutURL?width=&amp;hidden=true&amp;ordinal=5 col:Description?width=&amp;hidden=&amp;ordinal=7 col:AddDate?width=&amp;hidden=true&amp;ordinal=9 col:LastModDate?width=&amp;hidden=true&amp;ordinal=11 col:LastVisitDate?width=&amp;hidden=true&amp;ordinal=13" />
   <RDF:Description RDF:about="chrome://browser/content/preferences/downloadactions.xul#DownloadActionsWindow"
                    screenX="0"
                    screenY="0"
                    width="1200"
                    height="900" />
+  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#URL"
+                   ordinal="3" />
+  <RDF:Description RDF:about="chrome://browser/content/preferences/advanced-scripts.xul#AdvancedJSDialog"
+                   screenX="388"
+                   screenY="267" />
+  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#searchbox"
+                   value="full screen" />
   <RDF:Description RDF:about="chrome://browser/content/browser.xul#sidebar-title"
                    value="" />
-  <RDF:Description RDF:about="chrome://browser/content/preferences/downloadactions.xul">
-    <NC:persist RDF:resource="chrome://browser/content/preferences/downloadactions.xul#fileHandlersList"/>
-    <NC:persist RDF:resource="chrome://browser/content/preferences/downloadactions.xul#DownloadActionsWindow"/>
+  <RDF:Description RDF:about="NC:BookmarksRoot"
+                   NC:open="true" />
+  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#bookmark-folders-view"
+                   colinfo=" col:Name?width=&amp;hidden=&amp;ordinal=1" />
+  <RDF:Description RDF:about="chrome://browser/content/preferences/connection.xul">
+    <NC:persist RDF:resource="chrome://browser/content/preferences/connection.xul#ConnectionsDialog"/>
   </RDF:Description>
-  <RDF:Description RDF:about="chrome://browser/content/openLocation.xul#openLocation"
-                   screenX="194"
-                   screenY="74" />
-  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#LastModDate"
-                   ordinal="11" />
-  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#searchbox"
-                   value="full screen" />
-  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#AddDate"
-                   ordinal="9" />
-  <RDF:Description RDF:about="chrome://browser/content/preferences/languages.xul">
-    <NC:persist RDF:resource="chrome://browser/content/preferences/languages.xul#LanguagesDialog"/>
+  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#Name"
+                   ordinal="1" />
+  <RDF:Description RDF:about="chrome://browser/content/preferences/languages.xul#LanguagesDialog"
+                   screenX="303"
+                   screenY="193" />
+  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul">
+    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#Name"/>
+    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#URL"/>
+    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#ShortcutURL"/>
+    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#Description"/>
+    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#AddDate"/>
+    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#LastModDate"/>
+    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#LastVisitDate"/>
+    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#bookmark-window"/>
+    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#bookmark-folders-view"/>
+    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#bookmarks-view"/>
   </RDF:Description>
   <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#viewGroup"
                    last-selected="search" />
-  <RDF:Description RDF:about="chrome://browser/content/preferences/connection.xul">
-    <NC:persist RDF:resource="chrome://browser/content/preferences/connection.xul#ConnectionsDialog"/>
-  </RDF:Description>
   <RDF:Description RDF:about="chrome://browser/content/preferences/securityWarnings.xul#SecurityWarnings"
                    screenX="132"
                    screenY="267" />
-  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#bookmark-window"
+  <RDF:Description RDF:about="chrome://mozapps/content/downloads/unknownContentType.xul">
+    <NC:persist RDF:resource="chrome://mozapps/content/downloads/unknownContentType.xul#unknownContentType"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#AddDate"
+                   ordinal="9" />
+  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#extensions-view"
+                   last-selected="urn:mozilla:item:{4D498D0A-05AD-4fdb-97B5-8A0AABC1FC5B}" />
+  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#search-view"
+                   last-selected="urn:mozilla:addons:search:https://addons.mozilla.org/downloads/file/27674/full_screen-0.7-fx.xpi" />
+  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#extensionsManager"
                    screenX="0"
                    screenY="0"
                    sizemode="normal"
                    width="1200"
                    height="900" />
+  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#LastModDate"
+                   ordinal="11" />
+  <RDF:Description RDF:about="chrome://browser/content/preferences/connection.xul#ConnectionsDialog"
+                   screenX="221"
+                   screenY="28" />
+  <RDF:Description RDF:about="chrome://browser/content/preferences/preferences.xul#BrowserPreferences"
+                   screenX="0"
+                   screenY="0"
+                   lastSelected="paneAdvanced" />
+  <RDF:Description RDF:about="chrome://browser/content/openLocation.xul#openLocation"
+                   screenX="194"
+                   screenY="74" />
+  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#plugins-view"
+                   last-selected="urn:mozilla:item:/home/olpc/Activities/E-Paath-2_2-3-6_English-Maths-Nepali.activity/plugins/libnullplugin.so" />
+  <RDF:Description RDF:about="chrome://browser/content/preferences/downloadactions.xul#fileHandlersList"
+                   lastSelected="0" />
   <RDF:Description RDF:about="chrome://browser/content/browser.xul#toggle_taskbar"
                    checked="false" />
-  <RDF:Description RDF:about="chrome://mozapps/content/downloads/unknownContentType.xul#unknownContentType"
-                   screenX="255"
-                   screenY="179" />
-  <RDF:Description RDF:about="chrome://browser/content/browser.xul#sidebar-box"
-                   sidebarcommand=""
-                   width=""
-                   src="" />
-  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#bookmark-folders-view"
-                   colinfo=" col:Name?width=&amp;hidden=&amp;ordinal=1" />
-  <RDF:Description RDF:about="chrome://browser/content/preferences/advanced-scripts.xul#AdvancedJSDialog"
-                   screenX="388"
-                   screenY="267" />
-  <RDF:Description RDF:about="chrome://browser/content/preferences/securityWarnings.xul">
-    <NC:persist RDF:resource="chrome://browser/content/preferences/securityWarnings.xul#SecurityWarnings"/>
+  <RDF:Description RDF:about="chrome://browser/content/preferences/downloadactions.xul">
+    <NC:persist RDF:resource="chrome://browser/content/preferences/downloadactions.xul#fileHandlersList"/>
+    <NC:persist RDF:resource="chrome://browser/content/preferences/downloadactions.xul#DownloadActionsWindow"/>
   </RDF:Description>
-  <RDF:Description RDF:about="chrome://browser/content/browser.xul#status-bar"
-                   hidden="true" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#PersonalToolbar"
+                   collapsed="true" />
+  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#ShortcutURL"
+                   ordinal="5" />
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#nav-bar"
+                   collapsed="true" />
+  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#Description"
+                   ordinal="7" />
+  <RDF:Description RDF:about="chrome://browser/content/preferences/languages.xul">
+    <NC:persist RDF:resource="chrome://browser/content/preferences/languages.xul#LanguagesDialog"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="chrome://browser/content/preferences/sanitize.xul#SanitizeDialog"
+                   screenX="276"
+                   screenY="192" />
   <RDF:Description RDF:about="chrome://browser/content/browser.xul">
     <NC:persist RDF:resource="chrome://browser/content/browser.xul#main-window"/>
     <NC:persist RDF:resource="chrome://browser/content/browser.xul#sidebar-box"/>
@@ -78,82 +121,35 @@
     <NC:persist RDF:resource="chrome://browser/content/browser.xul#status-bar"/>
     <NC:persist RDF:resource="chrome://browser/content/browser.xul#toggle_taskbar"/>
   </RDF:Description>
-  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#URL"
-                   ordinal="3" />
-  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#plugins-view"
-                   last-selected="urn:mozilla:item:/home/olpc/Activities/E-Paath-2_2-3-6_English-Maths-Nepali.activity/plugins/libnullplugin.so" />
-  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#search-view"
-                   last-selected="urn:mozilla:addons:search:https://addons.mozilla.org/downloads/file/27674/full_screen-0.7-fx.xpi" />
-  <RDF:Description RDF:about="chrome://browser/content/browser.xul#main-window"
-                   screenX="0"
-                   screenY="0"
-                   width="1200"
-                   height="900"
-                   sizemode="fullscreen" />
-  <RDF:Description RDF:about="chrome://browser/content/preferences/preferences.xul#BrowserPreferences"
-                   screenX="0"
-                   screenY="0"
-                   lastSelected="paneAdvanced" />
-  <RDF:Description RDF:about="chrome://mozapps/content/downloads/unknownContentType.xul">
-    <NC:persist RDF:resource="chrome://mozapps/content/downloads/unknownContentType.xul#unknownContentType"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="chrome://browser/content/preferences/connection.xul#ConnectionsDialog"
-                   screenX="221"
-                   screenY="28" />
-  <RDF:Description RDF:about="chrome://browser/content/preferences/downloadactions.xul#fileHandlersList"
-                   lastSelected="0" />
-  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul">
-    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#Name"/>
-    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#URL"/>
-    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#ShortcutURL"/>
-    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#Description"/>
-    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#AddDate"/>
-    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#LastModDate"/>
-    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#LastVisitDate"/>
-    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#bookmark-window"/>
-    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#bookmark-folders-view"/>
-    <NC:persist RDF:resource="chrome://browser/content/bookmarks/bookmarksManager.xul#bookmarks-view"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#ShortcutURL"
-                   ordinal="5" />
   <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#LastVisitDate"
                    ordinal="13" />
-  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#extensionsManager"
+  <RDF:Description RDF:about="chrome://browser/content/preferences/sanitize.xul">
+    <NC:persist RDF:resource="chrome://browser/content/preferences/sanitize.xul#SanitizeDialog"/>
+  </RDF:Description>
+  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#bookmark-window"
                    screenX="0"
                    screenY="0"
                    sizemode="normal"
                    width="1200"
                    height="900" />
+  <RDF:Description RDF:about="rdf:#$FvPhC3"
+                   NC:open="true" />
+  <RDF:Description RDF:about="chrome://browser/content/preferences/advanced-scripts.xul">
+    <NC:persist RDF:resource="chrome://browser/content/preferences/advanced-scripts.xul#AdvancedJSDialog"/>
+  </RDF:Description>
   <RDF:Description RDF:about="chrome://browser/content/openLocation.xul">
     <NC:persist RDF:resource="chrome://browser/content/openLocation.xul#openLocation"/>
   </RDF:Description>
-  <RDF:Description RDF:about="chrome://browser/content/preferences/languages.xul#LanguagesDialog"
-                   screenX="303"
-                   screenY="193" />
-  <RDF:Description RDF:about="chrome://browser/content/browser.xul#PersonalToolbar"
-                   collapsed="true" />
-  <RDF:Description RDF:about="chrome://browser/content/preferences/sanitize.xul">
-    <NC:persist RDF:resource="chrome://browser/content/preferences/sanitize.xul#SanitizeDialog"/>
-  </RDF:Description>
+  <RDF:Description RDF:about="chrome://browser/content/browser.xul#main-window"
+                   screenX="0"
+                   screenY="0"
+                   width="1200"
+                   height="900"
+                   sizemode="fullscreen" />
+  <RDF:Description RDF:about="chrome://mozapps/content/downloads/unknownContentType.xul#unknownContentType"
+                   screenX="255"
+                   screenY="179" />
   <RDF:Description RDF:about="chrome://browser/content/preferences/preferences.xul">
     <NC:persist RDF:resource="chrome://browser/content/preferences/preferences.xul#BrowserPreferences"/>
   </RDF:Description>
-  <RDF:Description RDF:about="chrome://mozapps/content/extensions/extensions.xul#extensions-view"
-                   last-selected="urn:mozilla:item:{4D498D0A-05AD-4fdb-97B5-8A0AABC1FC5B}" />
-  <RDF:Description RDF:about="chrome://browser/content/preferences/advanced-scripts.xul">
-    <NC:persist RDF:resource="chrome://browser/content/preferences/advanced-scripts.xul#AdvancedJSDialog"/>
-  </RDF:Description>
-  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#Name"
-                   ordinal="1" />
-  <RDF:Description RDF:about="chrome://browser/content/preferences/sanitize.xul#SanitizeDialog"
-                   screenX="276"
-                   screenY="192" />
-  <RDF:Description RDF:about="NC:BookmarksRoot"
-                   NC:open="true" />
-  <RDF:Description RDF:about="chrome://browser/content/bookmarks/bookmarksManager.xul#bookmarks-view"
-                   colinfo=" col:Name?width=&amp;hidden=&amp;ordinal=1 col:URL?width=&amp;hidden=&amp;ordinal=3 col:ShortcutURL?width=&amp;hidden=true&amp;ordinal=5 col:Description?width=&amp;hidden=&amp;ordinal=7 col:AddDate?width=&amp;hidden=true&amp;ordinal=9 col:LastModDate?width=&amp;hidden=true&amp;ordinal=11 col:LastVisitDate?width=&amp;hidden=true&amp;ordinal=13" />
-  <RDF:Description RDF:about="chrome://browser/content/browser.xul#nav-bar"
-                   collapsed="true" />
-  <RDF:Description RDF:about="rdf:#$ZvPhC3"
-                   NC:open="true" />
 </RDF:RDF>
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/places.sqlite b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/places.sqlite
index 17b3b15..cfc506a 100755
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/places.sqlite
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/places.sqlite
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/prefs.js b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/prefs.js
index 99c405d..6638a70 100755
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/prefs.js
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/prefs.js
@@ -44,7 +44,7 @@ user_pref("browser.tabs.warnOnClose", false);
 user_pref("browser.tabs.warnOnOpen", false);
 user_pref("dom.allow_scripts_to_close_windows", true);
 user_pref("dom.disable_window_flip", false);
-user_pref("extensions.enabledItems", "{4D498D0A-05AD-4fdb-97B5-8A0AABC1FC5B}:0.7.2,firebug@software.joehewitt.com:1.4.5,ubufox@ubuntu.com:0.8,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.6");
+user_pref("extensions.enabledItems", "{4D498D0A-05AD-4fdb-97B5-8A0AABC1FC5B}:0.7.2,ubufox@ubuntu.com:0.8,{972ce4c6-7e08-4474-a285-3208198ce6fd}:3.6");
 user_pref("extensions.lastAppVersion", "3.6");
 user_pref("extensions.newAddons", false);
 user_pref("extensions.update.enabled", false);
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/search.json b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/search.json
index 96e93da..ff04ade 100644
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/search.json
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/search.json
@@ -1 +1 @@
-{"version":6,"buildID":"20100115133306","locale":"en-US","directories":{"/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/ubufox@ubuntu.com/searchplugins":{"lastModifiedTime":1256764772000,"engines":[{"_id":"/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/ubufox@ubuntu.com/searchplugins/ask.xml","_name":"Ask.com","description":"Ask.com Search Engine - Better Web Search","__searchForm":"http://www.ask.com/","_iconURL":"data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAACbm5sAAADJAAAA1gAAANMAAADYAAAAyACcnJ0AAADLAAEBywDCwsAAjIy2AH9/gwBdXa4AAAC5AAAAygAwMOEAMjLgADMzvQAEBHwAaGipAAAAzwCtsLEAhYWgAAsLygDq6toAQkK3AGZnigA5O84ACAiuANjY3wAICIsAAADAAGVljgAEBIQAAADfAGNiegAREZAAwsLzAAcHkwAEBZ0Ag4jOAC0twAALC7QAqK7dAKSq1wBycqQABATQAPT04ACYm74ARkaOALO09wAmJnQAJSXJADw9fwAzNc4ALzDCAHp6pACdnZkApKevAL29sQD5+foAkpKcAOzs4AAMDMoAPj7iAKGinACvr6oAT0/wAAwNyQAAANIAlJTaAN/f0QCcnZ0AAADRAF5erQAAAJ8AAADDAAAAzAA1NrwAMTGfAAkJ1QAAAMQAWlqvAHJ31wDMzMAAFhbHAAAAiQBERNIA8fHmAAgI1gCys6oAu7v4AD09ngDDwfoABgbOAM7N9wCYmPUAKyuOABkZmgAyMsEAiYq8AHp68gDDw5sAAgLPALW2rwCdnZgAAAC9AAMD1wCenpgA9fX1AAAArQCCgrIA0dLYAK+vnwB3e9kA5ubSAOfn+AClp6cA3NzDAMHHygBQU9MABATCAG5z2gAcHMQAio/aAAAA2QD19fwAnaHIAIaGogDm5uoAk5N0AK+ytAAMDNUAAAAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////////////////////////////////////////////////////////+DBgAAAAAASBX///////8GEzQ/Ll5VEUo9aXX///86e08hAg1qUUUiaymAOXf/NxQlglZvIzgzHksFeQxs/xcBEG1aWC1lc2YgCmEEUkE2BwFdaHAkQ3RGRxgqAmcWKwgFD1Q7Yn4xYzx2En0DGf9TBwFbLyZgCVwdQgtuBE7//3xEQD4nA1BZgTVXHwIw/////3pkHEkOTV8aTIR//////////yxyeBsycSj/////////////////////////////////////////////////AAD//wAA//8AAMAfAACABwAAAAEAAAABAAAAAAAAAAAAAAAAAACAAAAAwAAAAPABAAD8BwAA//8AAP//AAA=","_urls":[{"template":"http://www.ask.com/web","rels":[],"params":[{"name":"q","value":"{searchTerms}"},{"name":"o","value":"1576"},{"name":"l","value":"dis"}]}],"filePath":"/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/ubufox@ubuntu.com/searchplugins/ask.xml","_installLocation":3,"queryCharset":"UTF-8"}]},"/home/hitman/Software/firefox-3.6-EPaath/searchplugins":{"lastModifiedTime":1263595283000,"engines":[{"_id":"[app]/amazondotcom.xml","_name":"Amazon.com","description":"Amazon.com Search","__searchForm":"http://www.amazon.com/","_iconURL":"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHgSURBVHjalFM9TNtQEP4cB7PwM1RITUXIgsRaYEEVEyKZwhiyZAQyd0BhpFOlIjoBqhjSqVQMoVMLLAjEwECCQJkSkBqJYDOAFOMKFSf28d7DTUxiUDnp/Pzeu/vuu7t3ICKF6SLTMv2/lB0fRWKfjwDm4JJisYh0Oo3fpZLYT0SjSCQS8JAFMADNDZ3NZsnf1taiqVTKi4nGASruk5lkkmTmMB6JUKFQqO+DfX1eABWeQoVR6f7HSdM0obqu48Yw8G1tDT82NsRd1TSbU9BbGPCog8PDj+jLzurFoAVgMh4XxoNDQ6SqKi0tL9eBvAB8zZwymYxYY7EYAoEA8vm82BNTg6XUIs0MeGTZoR1mhXSnwNl4pmAbjU7mcjkKhkL1ynMnntZ4OEw3VyrV8utk7s5TdW++0QXz+1i3P7IK36t+PCfVn1OQOoOA0gXr5DPak+cPXbBK+/T3S69AtY3LJ98vZ1or/iLr+pTuvr59/A6s003UdqZFJF/PCKQ3o5CUznoBST2AfbEF/9iqYEDaIfwj73VJPEfgNTe0tWNYR0uwy9uOW0OkrgHI7z5ADo2C7v48nLV3XHKAT+x/1m1sX58xsBxg8rZJrDYD8DHHp4aJj/MK09sXjPOt46PcCzAACXY8/u34wN0AAAAASUVORK5CYII=","_urls":[{"template":"http://www.amazon.com/exec/obidos/external-search/","rels":[],"params":[{"name":"field-keywords","value":"{searchTerms}"},{"name":"mode","value":"blended"},{"name":"tag","value":"mozilla-20"},{"name":"sourceid","value":"Mozilla-search"}]}],"filePath":"/home/hitman/Software/firefox-3.6-EPaath/searchplugins/amazondotcom.xml"},{"_id":"[app]/yahoo.xml","_name":"Yahoo","description":"Yahoo Search","__searchForm":"http://search.yahoo.com/","_iconURL":"data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgJqAIoCdgCaAnoAnhKCAKYijgCuLpIAskKeALpSpgC+Yq4AzHy8ANqezgDmvt4A7tLqAPz5+wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKlRFIoABWAKERERE6ADcKMzzu2hOgAAhERK8REWCWBERE36ERMHMEREvo6iEgY6hEn6Pu0mAzqkz/xjMzoDNwpERERDoAMzAKlERIoAAzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAA//8AAP//AADAOQAAgBkAAAAPAAAACQAAAAkAAAAIAAAACAAAAAgAAIAYAADAOAAA//8AAP//AAD//wAA","_urls":[{"template":"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}","rels":[],"type":"application/x-suggestions+json","params":[]},{"template":"http://search.yahoo.com/search","rels":[],"params":[{"name":"p","value":"{searchTerms}"},{"name":"ei","value":"UTF-8"},{"pref":"yahoo-fr","name":"fr","condition":"pref","mozparam":true}]}],"filePath":"/home/hitman/Software/firefox-3.6-EPaath/searchplugins/yahoo.xml","queryCharset":"UTF-8"},{"_id":"[app]/creativecommons.xml","_name":"Creative Commons","description":"Find photos, movies, music, and text to rip, sample, mash, and share.","__searchForm":"http://search.creativecommons.org/","_iconURL":"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAJUSURBVDiNjZO9S1thGMXPvTfJFbnkipNkLLS0ksFg0M0lf4CboNCEgIIg/RiKtEOn0qGWTtbVoBYcIji10I9J0ApWCjp0kRaXdhHjTW4+uGnur4NJ8GOwZ3nf4TnnfZ5z3scAdBGGYdyVdN+yrGHTNNOtVqsVhuG+pO+S3gE/LtV3BIxzPDJNc8FxHGN0dNRKpVIGoJ2dndr+/r5Vr9cl6bmkN0AoSQIEyHXdj5KYnZ3F932uolKpkM/nK5KQ9FmSCZwLOI7zQBLr6+vXiFdRLBaDtsiTTve3YrFYkM/nbyR3MDU1dSKpLumO+vr6Xruui+d5AFSrVVZWVtjY2KDRaABwdHTE4uIie3t7AJTLZaLRaFXSCyUSid1MJgOA53n09/eTTqdJJpPMzc2xurqKbduMj48Tj8fZ3d0FYHBw8FjSezmOU56fnwdgeXkZ27ap1WpUKhWazSZjY2Nks1kASqVSd4zp6eljSX/MtiHdRDpnEATyfb+bkiSVSqXu3TCM8xgHBga+dkY4OzvDdV2GhoZIJBLMzMxQKBSIRqNkMhlisRhbW1sAJJPJn5I+KB6Pv7poou/7rK2tsbm5SRAEXROXlpY4ODgAoFarYdu2J+llN8ZcLvffMeZyud+SGpLuCVBPT89jSRQKhRvJxWKxISmU9JTOT5Rk9Pb2fpHE5OQkJycn14inp6dMTEx4bdM/SbKAy8sk6WEkElmwLCuSSqUYGRmxgHB7e7t+eHgYazabgaRnkt7SeZnr63xbUtYwjGHTNNNhGP4F9iR9a6/zr4v1/wDE1D9XlC4rrAAAAABJRU5ErkJggg==","_urls":[{"template":"http://search.creativecommons.org/","rels":[],"params":[{"name":"q","value":"{searchTerms}"},{"name":"sourceid","value":"Mozilla-search"}]}],"filePath":"/home/hitman/Software/firefox-3.6-EPaath/searchplugins/creativecommons.xml","queryCharset":"UTF-8"},{"_id":"[app]/answers.xml","_name":"Answers.com","description":"Dictionary Search on Answers.com","__searchForm":"http://www.answers.com/","_iconURL":"data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////K////4f////E////5f///+n////P////mv///0EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8E////fv///+//////////////////////7NnP/+LFtv/////+////of///xYAAAAAAAAAAAAAAAD///8D////lf////////////j0//bi1v/OlXf/tGU9/6FCEv/OmH3////////////////D////FgAAAAAAAAAA////avPm4P/evaz/8NbI//7r3//23M3/xYRi/5kzAP/Df1z//u/l//749P/v4dn/+PPw/////6j///8B////GP///+W/f1//smM7//bczf/+69///uvf/9ytlP+ZMwD/5se3/+/f1//AgmP/nj0N/927qv/////+////QP///2z/////8NvQ/8WCYP/+69///uvf//7r3/+7ckz/pUkb/9m1ov+ePQ3/okUW/8+fh//38O3//////////5r///+t//////7y6v/Cflv/58Cr//DRwP/mwKv/okQU/8ODYv/cuqj/yZN4//Tq5f/+9e///vDn///////////Q////yf/////+7+b/05yA/65ZLv+9dVD/sF40/5kzAP/kvKb//vTu//Tr5v/7+Pb//vfz//707f//////////6f///8X//////vDm/+K4ov/KjGz//ure/8uNbf+jRBX/+OTX/+3b0v+jSBr/pk0h/717Wv/Wrpr//Pn4/////+b///+i//////7z7f/02Mj/wn5b//vl2P+uWS7/vXhU//v49//48u//1q6a/717Wv+oUSb/tWxH//jz8P/////K////V///////+/j//ure/8aFZP/fs5v/oEAQ/9q1o/+zaEL/1ayX//718P/+9/P/+PHu//jz8P//////////h////wr////O///////38v/YpYr/tGQ7/6ZLHf/06eX/s2dB/549Df/x49z//vDn//7x6f//////////8////yoAAAAA////R/////v/////7dXI/5kzAP+7cUv//vHp/+vYzv+bNwX/vHlY//38/P///////////////30AAAAAAAAAAAAAAAD///9n////+/z5+P++e1n/3LGc//7w5//++PT/0KKL/8OIa//9/Pv//////////5X///8GAAAAAAAAAAAAAAAAAAAAAP///0n////K///////////////////////////+/v7/////5v///2z///8CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Cv///1f///+g////xP///8n///+r////bP///xoAAAAAAAAAAAAAAAAAAAAA+B////AH///AA///wAH//4AB//+AAP//AAD//wAA//8AAP//AAD//4AA//+AAf//wAP//+AD///wD////D///w==","_urls":[{"template":"http://www.answers.com/main/ntquery","rels":[],"params":[{"name":"s","value":"{searchTerms}"},{"name":"gwp","value":"13"}]},{"template":"http://www.answers.com/main/startswith?output=json&client=firefox&s={searchTerms}","rels":[],"type":"application/x-suggestions+json","params":[]}],"filePath":"/home/hitman/Software/firefox-3.6-EPaath/searchplugins/answers.xml","queryCharset":"UTF-8"},{"_id":"[app]/google.xml","_name":"Google","description":"Google Search","__searchForm":"http://www.google.com/firefox","_iconURL":"data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA","_urls":[{"template":"http://suggestqueries.google.com/complete/search?output=firefox&client=firefox&hl={moz:locale}&q={searchTerms}","rels":[],"type":"application/x-suggestions+json","params":[]},{"template":"http://www.google.com/search","rels":[],"params":[{"name":"q","value":"{searchTerms}"},{"name":"ie","value":"utf-8"},{"name":"oe","value":"utf-8"},{"name":"aq","value":"t"},{"name":"rls","value":"{moz:distributionID}:{moz:locale}:{moz:official}"},{"name":"client","falseValue":"firefox","trueValue":"firefox-a","condition":"defaultEngine","mozparam":true}]}],"filePath":"/home/hitman/Software/firefox-3.6-EPaath/searchplugins/google.xml","queryCharset":"UTF-8"},{"_id":"[app]/wikipedia.xml","_name":"Wikipedia (en)","description":"Wikipedia, the free encyclopedia","__searchForm":"http://en.wikipedia.org/wiki/Special:Search","_iconURL":"data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA","_urls":[{"template":"http://en.wikipedia.org/w/api.php","rels":[],"type":"application/x-suggestions+json","params":[{"name":"action","value":"opensearch"},{"name":"search","value":"{searchTerms}"}]},{"template":"http://en.wikipedia.org/wiki/Special:Search","rels":[],"params":[{"name":"search","value":"{searchTerms}"},{"name":"sourceid","value":"Mozilla-search"}]}],"filePath":"/home/hitman/Software/firefox-3.6-EPaath/searchplugins/wikipedia.xml","queryCharset":"UTF-8"},{"_id":"[app]/eBay.xml","_name":"eBay","description":"eBay - Online auctions","__searchForm":"http://search.ebay.com/","_iconURL":"data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAADAAAAA/wAAAABAAABAQAAAgEAAAMBAAAD/QAAAAIAAAECAAACAgAAAwIAAAP+AAAAAwAAAQMAAAIDAAADAwAAA/8AAAAD/AABA/wAAgP8AAMD/AAD//wAAAABAAEAAQACAAEAAwABAAP8AQAAAQEAAQEBAAIBAQADAQEAA/0BAAACAQABAgEAAgIBAAMCAQAD/gEAAAMBAAEDAQACAwEAAwMBAAP/AQAAA/0AAQP9AAID/QADA/0AA//9AAAAAgABAAIAAgACAAMAAgAD/AIAAAECAAEBAgACAQIAAwECAAP9AgAAAgIAAQICAAICAgADAgIAA/4CAAADAgABAwIAAgMCAAMDAgAD/wIAAAP+AAED/gACA/4AAwP+AAP//gAAAAMAAQADAAIAAwADAAMAA/wDAAABAwABAQMAAgEDAAMBAwAD/QMAAAIDAAECAwACAgMAAwIDAAP+AwAAAwMAAQMDAAIDAwADAwMAA/8DAAAD/wABA/8AAgP/AAMD/wAD//8AAAAD/AEAA/wCAAP8AwAD/AP8A/wAAQP8AQED/AIBA/wDAQP8A/0D/AACA/wBAgP8AgID/AMCA/wD/gP8AAMD/AEDA/wCAwP8AwMD/AP/A/wAA//8AQP//AID//wDA//8A////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8fHx8fHx8fHx8fHx8AAB8cGRkUFAcHBx8fBUKfAAAfFBkfHxNHF4cb29vCnwAAHxkZFBQUBx8HG98bwp8fAB8ZGR8UGQcXhxvb28KFXx8fHZkZGRNHBwcfG8jCgoQfAB8fHx8HBx8b29vCnwPCnwAAAB8fBwcfHx8EBB8Dwp8AAAAAHx8fHwAfHx8AHx8fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//AAD//wAA//8AAP//AACAAwAAAAMAAAADAAAAAQAAAAAAAAAAAACAAAAA4AAAAPCIAAD//wAA//8AAP//AAA=","_urls":[{"template":"http://rover.ebay.com/rover/1/711-47294-18009-3/4","rels":[],"params":[{"name":"satitle","value":"{searchTerms}"}]}],"filePath":"/home/hitman/Software/firefox-3.6-EPaath/searchplugins/eBay.xml"}]}}}
\ No newline at end of file
+{"version":6,"buildID":"20100115133306","locale":"en-US","directories":{"/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/ubufox@ubuntu.com/searchplugins":{"lastModifiedTime":1256764772000,"engines":[{"_id":"/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/ubufox@ubuntu.com/searchplugins/ask.xml","_name":"Ask.com","description":"Ask.com Search Engine - Better Web Search","__searchForm":"http://www.ask.com/","_iconURL":"data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAEAAAAAAACbm5sAAADJAAAA1gAAANMAAADYAAAAyACcnJ0AAADLAAEBywDCwsAAjIy2AH9/gwBdXa4AAAC5AAAAygAwMOEAMjLgADMzvQAEBHwAaGipAAAAzwCtsLEAhYWgAAsLygDq6toAQkK3AGZnigA5O84ACAiuANjY3wAICIsAAADAAGVljgAEBIQAAADfAGNiegAREZAAwsLzAAcHkwAEBZ0Ag4jOAC0twAALC7QAqK7dAKSq1wBycqQABATQAPT04ACYm74ARkaOALO09wAmJnQAJSXJADw9fwAzNc4ALzDCAHp6pACdnZkApKevAL29sQD5+foAkpKcAOzs4AAMDMoAPj7iAKGinACvr6oAT0/wAAwNyQAAANIAlJTaAN/f0QCcnZ0AAADRAF5erQAAAJ8AAADDAAAAzAA1NrwAMTGfAAkJ1QAAAMQAWlqvAHJ31wDMzMAAFhbHAAAAiQBERNIA8fHmAAgI1gCys6oAu7v4AD09ngDDwfoABgbOAM7N9wCYmPUAKyuOABkZmgAyMsEAiYq8AHp68gDDw5sAAgLPALW2rwCdnZgAAAC9AAMD1wCenpgA9fX1AAAArQCCgrIA0dLYAK+vnwB3e9kA5ubSAOfn+AClp6cA3NzDAMHHygBQU9MABATCAG5z2gAcHMQAio/aAAAA2QD19fwAnaHIAIaGogDm5uoAk5N0AK+ytAAMDNUAAAAAAP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA//////////////////////////////////////////////////////////////////+DBgAAAAAASBX///////8GEzQ/Ll5VEUo9aXX///86e08hAg1qUUUiaymAOXf/NxQlglZvIzgzHksFeQxs/xcBEG1aWC1lc2YgCmEEUkE2BwFdaHAkQ3RGRxgqAmcWKwgFD1Q7Yn4xYzx2En0DGf9TBwFbLyZgCVwdQgtuBE7//3xEQD4nA1BZgTVXHwIw/////3pkHEkOTV8aTIR//////////yxyeBsycSj/////////////////////////////////////////////////AAD//wAA//8AAMAfAACABwAAAAEAAAABAAAAAAAAAAAAAAAAAACAAAAAwAAAAPABAAD8BwAA//8AAP//AAA=","_urls":[{"template":"http://www.ask.com/web","rels":[],"params":[{"name":"q","value":"{searchTerms}"},{"name":"o","value":"1576"},{"name":"l","value":"dis"}]}],"filePath":"/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/ubufox@ubuntu.com/searchplugins/ask.xml","_installLocation":3,"queryCharset":"UTF-8"}]},"/home/hitman/karma/mainline/tools/xo_bundle/searchplugins":{"lastModifiedTime":1266149692000,"engines":[{"_id":"[app]/answers.xml","_name":"Answers.com","description":"Dictionary Search on Answers.com","__searchForm":"http://www.answers.com/","_iconURL":"data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAABMLAAATCwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////K////4f////E////5f///+n////P////mv///0EAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8E////fv///+//////////////////////7NnP/+LFtv/////+////of///xYAAAAAAAAAAAAAAAD///8D////lf////////////j0//bi1v/OlXf/tGU9/6FCEv/OmH3////////////////D////FgAAAAAAAAAA////avPm4P/evaz/8NbI//7r3//23M3/xYRi/5kzAP/Df1z//u/l//749P/v4dn/+PPw/////6j///8B////GP///+W/f1//smM7//bczf/+69///uvf/9ytlP+ZMwD/5se3/+/f1//AgmP/nj0N/927qv/////+////QP///2z/////8NvQ/8WCYP/+69///uvf//7r3/+7ckz/pUkb/9m1ov+ePQ3/okUW/8+fh//38O3//////////5r///+t//////7y6v/Cflv/58Cr//DRwP/mwKv/okQU/8ODYv/cuqj/yZN4//Tq5f/+9e///vDn///////////Q////yf/////+7+b/05yA/65ZLv+9dVD/sF40/5kzAP/kvKb//vTu//Tr5v/7+Pb//vfz//707f//////////6f///8X//////vDm/+K4ov/KjGz//ure/8uNbf+jRBX/+OTX/+3b0v+jSBr/pk0h/717Wv/Wrpr//Pn4/////+b///+i//////7z7f/02Mj/wn5b//vl2P+uWS7/vXhU//v49//48u//1q6a/717Wv+oUSb/tWxH//jz8P/////K////V///////+/j//ure/8aFZP/fs5v/oEAQ/9q1o/+zaEL/1ayX//718P/+9/P/+PHu//jz8P//////////h////wr////O///////38v/YpYr/tGQ7/6ZLHf/06eX/s2dB/549Df/x49z//vDn//7x6f//////////8////yoAAAAA////R/////v/////7dXI/5kzAP+7cUv//vHp/+vYzv+bNwX/vHlY//38/P///////////////30AAAAAAAAAAAAAAAD///9n////+/z5+P++e1n/3LGc//7w5//++PT/0KKL/8OIa//9/Pv//////////5X///8GAAAAAAAAAAAAAAAAAAAAAP///0n////K///////////////////////////+/v7/////5v///2z///8CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Cv///1f///+g////xP///8n///+r////bP///xoAAAAAAAAAAAAAAAAAAAAA+B////AH///AA///wAH//4AB//+AAP//AAD//wAA//8AAP//AAD//4AA//+AAf//wAP//+AD///wD////D///w==","_urls":[{"template":"http://www.answers.com/main/ntquery","rels":[],"params":[{"name":"s","value":"{searchTerms}"},{"name":"gwp","value":"13"}]},{"template":"http://www.answers.com/main/startswith?output=json&client=firefox&s={searchTerms}","rels":[],"type":"application/x-suggestions+json","params":[]}],"filePath":"/home/hitman/karma/mainline/tools/xo_bundle/searchplugins/answers.xml","queryCharset":"UTF-8"},{"_id":"[app]/google.xml","_name":"Google","description":"Google Search","__searchForm":"http://www.google.com/firefox","_iconURL":"data:image/png;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADs9Pt8xetPtu9FsfFNtu%2BTzvb2%2B%2Fne4dFJeBw0egA%2FfAJAfAA8ewBBegAAAAD%2B%2FPtft98Mp%2BwWsfAVsvEbs%2FQeqvF8xO7%2F%2F%2F63yqkxdgM7gwE%2FggM%2BfQA%2BegBDeQDe7PIbotgQufcMufEPtfIPsvAbs%2FQvq%2Bfz%2Bf%2F%2B%2B%2FZKhR05hgBBhQI8hgBAgAI9ewD0%2B%2Fg3pswAtO8Cxf4Kw%2FsJvvYAqupKsNv%2B%2Fv7%2F%2FP5VkSU0iQA7jQA9hgBDgQU%2BfQH%2F%2Ff%2FQ6fM4sM4KsN8AteMCruIqqdbZ7PH8%2Fv%2Fg6Nc%2Fhg05kAA8jAM9iQI%2BhQA%2BgQDQu6b97uv%2F%2F%2F7V8Pqw3eiWz97q8%2Ff%2F%2F%2F%2F7%2FPptpkkqjQE4kwA7kAA5iwI8iAA8hQCOSSKdXjiyflbAkG7u2s%2F%2B%2F%2F39%2F%2F7r8utrqEYtjQE8lgA7kwA7kwA9jwA9igA9hACiWSekVRyeSgiYSBHx6N%2F%2B%2Fv7k7OFRmiYtlAA5lwI7lwI4lAA7kgI9jwE9iwI4iQCoVhWcTxCmb0K%2BooT8%2Fv%2F7%2F%2F%2FJ2r8fdwI1mwA3mQA3mgA8lAE8lAE4jwA9iwE%2BhwGfXifWvqz%2B%2Ff%2F58u%2Fev6Dt4tr%2B%2F%2F2ZuIUsggA7mgM6mAM3lgA5lgA6kQE%2FkwBChwHt4dv%2F%2F%2F728ei1bCi7VAC5XQ7kz7n%2F%2F%2F6bsZkgcB03lQA9lgM7kwA2iQktZToPK4r9%2F%2F%2F9%2F%2F%2FSqYK5UwDKZAS9WALIkFn%2B%2F%2F3%2F%2BP8oKccGGcIRJrERILYFEMwAAuEAAdX%2F%2Ff7%2F%2FP%2B%2BfDvGXQLIZgLEWgLOjlf7%2F%2F%2F%2F%2F%2F9QU90EAPQAAf8DAP0AAfMAAOUDAtr%2F%2F%2F%2F7%2B%2Fu2bCTIYwDPZgDBWQDSr4P%2F%2Fv%2F%2F%2FP5GRuABAPkAA%2FwBAfkDAPAAAesAAN%2F%2F%2B%2Fz%2F%2F%2F64g1C5VwDMYwK8Yg7y5tz8%2Fv%2FV1PYKDOcAAP0DAf4AAf0AAfYEAOwAAuAAAAD%2F%2FPvi28ymXyChTATRrIb8%2F%2F3v8fk6P8MAAdUCAvoAAP0CAP0AAfYAAO4AAACAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAA","_urls":[{"template":"http://suggestqueries.google.com/complete/search?output=firefox&client=firefox&hl={moz:locale}&q={searchTerms}","rels":[],"type":"application/x-suggestions+json","params":[]},{"template":"http://www.google.com/search","rels":[],"params":[{"name":"q","value":"{searchTerms}"},{"name":"ie","value":"utf-8"},{"name":"oe","value":"utf-8"},{"name":"aq","value":"t"},{"name":"rls","value":"{moz:distributionID}:{moz:locale}:{moz:official}"},{"name":"client","falseValue":"firefox","trueValue":"firefox-a","condition":"defaultEngine","mozparam":true}]}],"filePath":"/home/hitman/karma/mainline/tools/xo_bundle/searchplugins/google.xml","queryCharset":"UTF-8"},{"_id":"[app]/yahoo.xml","_name":"Yahoo","description":"Yahoo Search","__searchForm":"http://search.yahoo.com/","_iconURL":"data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAbgJqAIoCdgCaAnoAnhKCAKYijgCuLpIAskKeALpSpgC+Yq4AzHy8ANqezgDmvt4A7tLqAPz5+wD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKlRFIoABWAKERERE6ADcKMzzu2hOgAAhERK8REWCWBERE36ERMHMEREvo6iEgY6hEn6Pu0mAzqkz/xjMzoDNwpERERDoAMzAKlERIoAAzMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAA//8AAP//AADAOQAAgBkAAAAPAAAACQAAAAkAAAAIAAAACAAAAAgAAIAYAADAOAAA//8AAP//AAD//wAA","_urls":[{"template":"http://ff.search.yahoo.com/gossip?output=fxjson&command={searchTerms}","rels":[],"type":"application/x-suggestions+json","params":[]},{"template":"http://search.yahoo.com/search","rels":[],"params":[{"name":"p","value":"{searchTerms}"},{"name":"ei","value":"UTF-8"},{"pref":"yahoo-fr","name":"fr","condition":"pref","mozparam":true}]}],"filePath":"/home/hitman/karma/mainline/tools/xo_bundle/searchplugins/yahoo.xml","queryCharset":"UTF-8"},{"_id":"[app]/wikipedia.xml","_name":"Wikipedia (en)","description":"Wikipedia, the free encyclopedia","__searchForm":"http://en.wikipedia.org/wiki/Special:Search","_iconURL":"data:image/x-icon;base64,AAABAAEAEBAQAAEABAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAEAgQAhIOEAMjHyABIR0gA6ejpAGlqaQCpqKkAKCgoAPz9%2FAAZGBkAmJiYANjZ2ABXWFcAent6ALm6uQA8OjwAiIiIiIiIiIiIiI4oiL6IiIiIgzuIV4iIiIhndo53KIiIiB%2FWvXoYiIiIfEZfWBSIiIEGi%2FfoqoiIgzuL84i9iIjpGIoMiEHoiMkos3FojmiLlUipYliEWIF%2BiDe0GoRa7D6GPbjcu1yIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA","_urls":[{"template":"http://en.wikipedia.org/w/api.php","rels":[],"type":"application/x-suggestions+json","params":[{"name":"action","value":"opensearch"},{"name":"search","value":"{searchTerms}"}]},{"template":"http://en.wikipedia.org/wiki/Special:Search","rels":[],"params":[{"name":"search","value":"{searchTerms}"},{"name":"sourceid","value":"Mozilla-search"}]}],"filePath":"/home/hitman/karma/mainline/tools/xo_bundle/searchplugins/wikipedia.xml","queryCharset":"UTF-8"},{"_id":"[app]/eBay.xml","_name":"eBay","description":"eBay - Online auctions","__searchForm":"http://search.ebay.com/","_iconURL":"data:image/x-icon;base64,AAABAAEAEBAAAAEACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAIAAAADAAAAA/wAAAABAAABAQAAAgEAAAMBAAAD/QAAAAIAAAECAAACAgAAAwIAAAP+AAAAAwAAAQMAAAIDAAADAwAAA/8AAAAD/AABA/wAAgP8AAMD/AAD//wAAAABAAEAAQACAAEAAwABAAP8AQAAAQEAAQEBAAIBAQADAQEAA/0BAAACAQABAgEAAgIBAAMCAQAD/gEAAAMBAAEDAQACAwEAAwMBAAP/AQAAA/0AAQP9AAID/QADA/0AA//9AAAAAgABAAIAAgACAAMAAgAD/AIAAAECAAEBAgACAQIAAwECAAP9AgAAAgIAAQICAAICAgADAgIAA/4CAAADAgABAwIAAgMCAAMDAgAD/wIAAAP+AAED/gACA/4AAwP+AAP//gAAAAMAAQADAAIAAwADAAMAA/wDAAABAwABAQMAAgEDAAMBAwAD/QMAAAIDAAECAwACAgMAAwIDAAP+AwAAAwMAAQMDAAIDAwADAwMAA/8DAAAD/wABA/8AAgP/AAMD/wAD//8AAAAD/AEAA/wCAAP8AwAD/AP8A/wAAQP8AQED/AIBA/wDAQP8A/0D/AACA/wBAgP8AgID/AMCA/wD/gP8AAMD/AEDA/wCAwP8AwMD/AP/A/wAA//8AQP//AID//wDA//8A////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB8fHx8fHx8fHx8fHx8AAB8cGRkUFAcHBx8fBUKfAAAfFBkfHxNHF4cb29vCnwAAHxkZFBQUBx8HG98bwp8fAB8ZGR8UGQcXhxvb28KFXx8fHZkZGRNHBwcfG8jCgoQfAB8fHx8HBx8b29vCnwPCnwAAAB8fBwcfHx8EBB8Dwp8AAAAAHx8fHwAfHx8AHx8fAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//AAD//wAA//8AAP//AACAAwAAAAMAAAADAAAAAQAAAAAAAAAAAACAAAAA4AAAAPCIAAD//wAA//8AAP//AAA=","_urls":[{"template":"http://rover.ebay.com/rover/1/711-47294-18009-3/4","rels":[],"params":[{"name":"satitle","value":"{searchTerms}"}]}],"filePath":"/home/hitman/karma/mainline/tools/xo_bundle/searchplugins/eBay.xml"},{"_id":"[app]/amazondotcom.xml","_name":"Amazon.com","description":"Amazon.com Search","__searchForm":"http://www.amazon.com/","_iconURL":"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHgSURBVHjalFM9TNtQEP4cB7PwM1RITUXIgsRaYEEVEyKZwhiyZAQyd0BhpFOlIjoBqhjSqVQMoVMLLAjEwECCQJkSkBqJYDOAFOMKFSf28d7DTUxiUDnp/Pzeu/vuu7t3ICKF6SLTMv2/lB0fRWKfjwDm4JJisYh0Oo3fpZLYT0SjSCQS8JAFMADNDZ3NZsnf1taiqVTKi4nGASruk5lkkmTmMB6JUKFQqO+DfX1eABWeQoVR6f7HSdM0obqu48Yw8G1tDT82NsRd1TSbU9BbGPCog8PDj+jLzurFoAVgMh4XxoNDQ6SqKi0tL9eBvAB8zZwymYxYY7EYAoEA8vm82BNTg6XUIs0MeGTZoR1mhXSnwNl4pmAbjU7mcjkKhkL1ynMnntZ4OEw3VyrV8utk7s5TdW++0QXz+1i3P7IK36t+PCfVn1OQOoOA0gXr5DPak+cPXbBK+/T3S69AtY3LJ98vZ1or/iLr+pTuvr59/A6s003UdqZFJF/PCKQ3o5CUznoBST2AfbEF/9iqYEDaIfwj73VJPEfgNTe0tWNYR0uwy9uOW0OkrgHI7z5ADo2C7v48nLV3XHKAT+x/1m1sX58xsBxg8rZJrDYD8DHHp4aJj/MK09sXjPOt46PcCzAACXY8/u34wN0AAAAASUVORK5CYII=","_urls":[{"template":"http://www.amazon.com/exec/obidos/external-search/","rels":[],"params":[{"name":"field-keywords","value":"{searchTerms}"},{"name":"mode","value":"blended"},{"name":"tag","value":"mozilla-20"},{"name":"sourceid","value":"Mozilla-search"}]}],"filePath":"/home/hitman/karma/mainline/tools/xo_bundle/searchplugins/amazondotcom.xml"},{"_id":"[app]/creativecommons.xml","_name":"Creative Commons","description":"Find photos, movies, music, and text to rip, sample, mash, and share.","__searchForm":"http://search.creativecommons.org/","_iconURL":"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAJUSURBVDiNjZO9S1thGMXPvTfJFbnkipNkLLS0ksFg0M0lf4CboNCEgIIg/RiKtEOn0qGWTtbVoBYcIji10I9J0ApWCjp0kRaXdhHjTW4+uGnur4NJ8GOwZ3nf4TnnfZ5z3scAdBGGYdyVdN+yrGHTNNOtVqsVhuG+pO+S3gE/LtV3BIxzPDJNc8FxHGN0dNRKpVIGoJ2dndr+/r5Vr9cl6bmkN0AoSQIEyHXdj5KYnZ3F932uolKpkM/nK5KQ9FmSCZwLOI7zQBLr6+vXiFdRLBaDtsiTTve3YrFYkM/nbyR3MDU1dSKpLumO+vr6Xruui+d5AFSrVVZWVtjY2KDRaABwdHTE4uIie3t7AJTLZaLRaFXSCyUSid1MJgOA53n09/eTTqdJJpPMzc2xurqKbduMj48Tj8fZ3d0FYHBw8FjSezmOU56fnwdgeXkZ27ap1WpUKhWazSZjY2Nks1kASqVSd4zp6eljSX/MtiHdRDpnEATyfb+bkiSVSqXu3TCM8xgHBga+dkY4OzvDdV2GhoZIJBLMzMxQKBSIRqNkMhlisRhbW1sAJJPJn5I+KB6Pv7poou/7rK2tsbm5SRAEXROXlpY4ODgAoFarYdu2J+llN8ZcLvffMeZyud+SGpLuCVBPT89jSRQKhRvJxWKxISmU9JTOT5Rk9Pb2fpHE5OQkJycn14inp6dMTEx4bdM/SbKAy8sk6WEkElmwLCuSSqUYGRmxgHB7e7t+eHgYazabgaRnkt7SeZnr63xbUtYwjGHTNNNhGP4F9iR9a6/zr4v1/wDE1D9XlC4rrAAAAABJRU5ErkJggg==","_urls":[{"template":"http://search.creativecommons.org/","rels":[],"params":[{"name":"q","value":"{searchTerms}"},{"name":"sourceid","value":"Mozilla-search"}]}],"filePath":"/home/hitman/karma/mainline/tools/xo_bundle/searchplugins/creativecommons.xml","queryCharset":"UTF-8"}]}}}
\ No newline at end of file
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/urlclassifier3.sqlite b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/urlclassifier3.sqlite
index c69cebe..e12ff5e 100644
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/urlclassifier3.sqlite
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/urlclassifier3.sqlite
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/webappsstore.sqlite b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/webappsstore.sqlite
index 25ba0fb..ef740f8 100755
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/webappsstore.sqlite
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/webappsstore.sqlite
diff --git a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/xpti.dat b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/xpti.dat
index a3ce1a9..bba0bec 100644
--- a/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/xpti.dat
+++ b/tools/xo_bundle/.mozilla/firefox/ukm0hbpm.default/xpti.dat
@@ -2,15 +2,14 @@
 
 [Header,2]
 0,Version,2,0
-1,AppDir,/home/hitman/Software/firefox-3.6-EPaath
+1,AppDir,/home/hitman/karma/mainline/tools/xo_bundle
 
-[Directories,3]
-0,/home/hitman/Software/firefox-3.6-EPaath/components
-1,/home/hitman/Software/firefox-3.6-EPaath/extensions/firebug@software.joehewitt.com/components
-2,/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/ubufox@ubuntu.com/components
+[Directories,2]
+0,/home/hitman/karma/mainline/tools/xo_bundle/components
+1,/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/ubufox@ubuntu.com/components
 
 [Files,1]
-0,browser.xpt,0,365568,1263595306000
+0,browser.xpt,0,365568,1266149691000
 
 [ArchiveItems,0]
 
diff --git a/tools/xo_bundle/launch-local.sh b/tools/xo_bundle/launch.sh
index 2025498..ece5a2d 100644
--- a/tools/xo_bundle/launch-local.sh
+++ b/tools/xo_bundle/launch.sh
@@ -1 +1 @@
-./run-mozilla.sh ./firefox-bin -profile .mozilla/firefox/ukm0hbpm.default ./karma/list.html
\ No newline at end of file
+./run-mozilla.sh ./firefox-bin -profile .mozilla/firefox/ukm0hbpm.default $1
\ No newline at end of file
diff --git a/tools/xo_bundle/launch-local.sh b/tools/xo_bundle/launch.sh~
index 2025498..2025498 100644
--- a/tools/xo_bundle/launch-local.sh
+++ b/tools/xo_bundle/launch.sh~