wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity
93,521 Commits 1 Branch 166 Tags 1.2 GiB
e332b73b94
Commit Graph

1696 Commits

Author SHA1 Message Date
Jonathan Griffin
74ba9d4b86 Bug 747070 - Catch errors when posting to autolog, a=testonly, npotb 2012-04-19 10:31:34 -07:00
Josh Matthews
fb81af3718 Bug 729204 - Make docshell privacy notifications work across multiple processes. r=bz 2012-04-19 20:13:20 -04:00
Nick Hurley
6f00f04785 Bug 719609 - Part 2: xpcshell harness support for running the node spdy server. r=ted 2012-04-25 20:12:33 -04:00
Nick Hurley
8a69e692d9 Bug 719609 - Part 1: Add some basic unit tests for SPDY. r=mcmanus,ted 2012-04-25 20:12:33 -04:00
Joel Maher
a06e6b0ce3 Bug 745727 - deploy a new talos.zip for tcheck2 and non null revision/sourcestamps. r=armenzg 2012-04-16 09:27:13 -04:00
Malini Das
ae16512739 Bug 749862 - findElements should return all matching elements, r=jgriffin, a=test-only 2012-05-07 14:00:30 -07:00
Terrence Cole
6b8c3b1c5a Bug 746236 - Fix make -C builddir jstestbrowser; r=ted.mielczarek 
Broken by Bug 735549.
 2012-04-17 11:40:57 -07:00
Steve Fink
5bd9c043ff Bug 732255 - Prevent -d option from infecting later xpcshell tests. r=ted 
--HG--
extra : rebase_source : aea5cfff5a318cc25072b9bee493f0ee0468e840
 2012-05-03 12:32:31 -07:00
Geoff Brown
3cbbe8cad1 Bug 748489 - Provide a writable TMPDIR for android xpcshell tests. r=jmaher 2012-05-03 06:22:33 -04:00
Joey Armstrong
844ee8d341 Bug 739710 - Makefile.in edits to use mkdir_deps function: file batch #2. r=ted 2012-05-03 06:22:33 -04:00
Ralph Giles
c7464ef85a Bug 674225 - Add basic mochitests for Opus. r=cpearce 
Add a short Ogg Opus file to the content/media/test
directory and add it to the gSeekTests, gSmallTests,
and gPlayTests in manifest.js. This file is crafted
to end on a packet boundary, so trimming to duration
is not verified.
Set the media.opus.enabled pref to true in manifest.js
so the various tests using the opus file succeed.

Add a stanza to can_play_type_ogg.js to test the
behaviour of canPlayType with an opus-specific
media type for both values of the pref.

Add support for the .opus filename extension to
the mochitest http server.
 2012-05-01 17:29:42 -07:00
Masayuki Nakano
0a7ff20ae3 Bug 166240 part.8 Add tests for KeyboardEvent.location (synthesized events) r=smaug, sr=jst 2012-05-03 17:35:02 +09:00
Paolo Amadini
cc07746d4f Bug 726444 - Implement the Downloads Panel. r=mak ui-r=limi 
Includes: Bug 697679 - By Javi Rueda <leofigueres@yahoo.com>.
 2012-04-17 13:35:09 +02:00
Jim Blandy
b0a75a4062 Bug 743026: Make the --verbose flag to runxpcshelltests.py also show the command, environment, and cwd. r=ted 2012-04-16 14:19:07 -07:00
Joel Maher
733a39c668 Bug 746545 - remove duplicate mozinfo.py files. r=ted 2012-04-25 09:22:04 -04:00
Matt Brubeck
654badcd06 Merge mozilla-central to mozilla-inbound 2012-04-13 14:09:05 -07:00
Joel Maher
726f3feffb Bug 745129 - upload a new talos.zip to include raw results and saved off minidumps. r=armenzg 2012-04-13 10:43:49 -04:00
Jonathan Griffin
7d12fc4d13 Bug 745307 - update import statements for log4moz.js, a=testonly 2012-04-13 13:06:01 -07:00
Gregory Szorc
400350bbd0 Merge services-central into mozilla-central 2012-04-11 11:46:19 -07:00
Richard Newman
37e9e4adab Merge m-c to s-c. 2012-04-10 22:20:12 -07:00
Richard Newman
a1735e0ff4 Merge m-c to s-c. 2012-04-09 18:57:46 -07:00
Jonathan Griffin
bbec5046ca Bug 743872 - update TPS to use latest pulsebuildmonitor, a=testonly, DONTBUILD, npotb 2012-04-09 17:09:20 -07:00
Gregory Szorc
49412510e0 Bug 731494 - Refactor generic code from services/sync into services/common; r=rnewman 
--HG--
rename : services/sync/modules/async.js => services/common/async.js
rename : services/sync/modules/log4moz.js => services/common/log4moz.js
rename : services/sync/modules/ext/Observers.js => services/common/observers.js
rename : services/sync/modules/ext/Preferences.js => services/common/preferences.js
rename : services/sync/modules/ext/StringBundle.js => services/common/stringbundle.js
rename : services/sync/tests/unit/test_async_chain.js => services/common/tests/unit/test_async_chain.js
rename : services/sync/tests/unit/test_async_querySpinningly.js => services/common/tests/unit/test_async_querySpinningly.js
rename : services/sync/tests/unit/test_log4moz.js => services/common/tests/unit/test_log4moz.js
rename : services/sync/tests/unit/test_Observers.js => services/common/tests/unit/test_observers.js
rename : services/sync/tests/unit/test_Preferences.js => services/common/tests/unit/test_preferences.js
rename : services/sync/tests/unit/test_restrequest.js => services/common/tests/unit/test_restrequest.js
rename : services/sync/tests/unit/test_utils_makeURI.js => services/common/tests/unit/test_utils_makeURI.js
rename : services/sync/tests/unit/test_utils_namedTimer.js => services/common/tests/unit/test_utils_namedTimer.js
rename : services/sync/tests/unit/test_utils_stackTrace.js => services/common/tests/unit/test_utils_stackTrace.js
 2012-04-05 23:26:06 -07:00
Serge Gautherie
38c4d95ed1 Bug 637101. (Bv1) Add a 1 second delay before calling killTest(), Fix bug 647323 regression, Remove extra ';' and spaces. r=ted.mielczarek. 2012-04-05 21:00:02 +02:00
Malini Das
63edf3da6d Bug 742947 - Integrate Selenium atoms, r=jgriffin 2012-04-10 17:28:08 -07:00
Dão Gottwald
92a61d5d9e Bug 723953 - Fennec chrome scripts and tests leak global variables. r=mbrubeck 2012-04-06 22:02:15 +02:00
Malini Das
72a588c5e4 Bug 742513 - allow marionette to launch b2g desktop build, r=jgriffin 2012-04-04 15:56:26 -07:00
Jonathan Griffin
8c299a16e9 Bug 740227 - Add TPS to package tests, r=ted, a=testonly 2012-04-09 15:11:07 -07:00
Jonathan Griffin
007d1ed3a9 Bug 742947 - backout 65f02c832a0e due to b2g bustage 2012-04-10 12:29:17 -07:00
Malini Das
7f6d828ded Bug 742947 - tests for functionality provided by Selenium atoms, r=jgriffin 2012-04-10 11:23:38 -07:00
Malini Das
6c41643a1a Bug 742947 - Integrate select Selenium atoms with Marionette, r=jgriffin, 2012-04-10 11:23:29 -07:00
Malini Das
5f7050f660 Bug 741598 - Enable finding elements of child nodes, r=jgriffin 2012-04-03 11:08:49 -07:00
Kyle Huey
a19142cede Bug 722428: Fix leaks in mochitest by reworking SpecialPowers and nsDOMWindowUtils. r=mounir,ctalbert 2012-04-01 19:23:51 -07:00
Ed Morley
c7a3740e33 Merge mozilla-central to mozilla-inbound 2012-03-31 15:28:55 +01:00
Ed Morley
ed0884bbc1 Merge last PGO-green changeset of mozilla-inbound to mozilla-central 2012-03-30 16:13:46 +01:00
Marco Bonardo
d3b8a6debe Merge central to inbound 2012-03-30 12:27:55 +02:00
Serge Gautherie
f5613aa5bb Bug 733269. (Av1) redirect.html: Let its load complete before redirecting. rs=jwalden. 2012-03-30 12:27:50 +02:00
Ms2ger
9892fde4a2 Bug 647323 - Part b: Implement test harness reporting code and import testharness code from the upstream repository; r=jhammel+ted 2012-03-29 23:08:43 +02:00
Jonathan Griffin
5cf6887314 Bug 740549 - add newline to dump statement, r=mdas, a=testonly 2012-03-29 12:34:00 -07:00
Peter Van der Beken
702fa57682 Fix for bug 740397 (Make tests that try to get XHR.channel use SpecialPowers). r=bholley. 
--HG--
extra : rebase_source : 0bd78094debfea9d179f17396626c3802a6b5a21
 2012-03-29 11:15:09 -07:00
Gregory Szorc
b242ffa758 Bug 739753 - Fatal handling of invalid head and tail files in xpcshell test runner; r=ted 2012-03-28 16:05:22 -07:00
Peter Van der Beken
6a91bcfada Fix for bug 739898 (Stop using enablePrivilege in test_bug480509.html). r=bz. 2012-03-27 16:31:36 -07:00
Mark Cote
d77014a370 Bug 739924 - Please rename testing/peptest/tests/firefox/server/mozilla.org/index.html.orig. r=jmaher 2012-03-28 10:33:50 -04:00
Armen Zambrano Gasparnian
ed3aecfba2 Bug 739768. We fixed the talos.zip issue with a symlink but let's be cut and clear to which talos.zip is the good one. DONTBUILD. r=jhammel 2012-03-27 17:16:48 -04:00
Hiroyuki Ikezoe
391b8f5545 Bug 739497 - Fix the comment of filter method for xpcshell.ini. r=jmaher 2012-03-30 11:42:15 -04:00
Mark Cote
a6a1de6667 Bug 749275 Add ability to run peptests with configurable number of iterations r=ctalbert 2012-05-04 14:34:53 -07:00
Jonathan Griffin
24690d19d0 Bug 751787 - Add proper dependencies to setup.py, a=npotb 2012-05-04 10:52:39 -07:00
Joel Maher
2219301d4a Bug 732638 - After "make reftest" or "make crashtest" run completes w/ failures, the harness says "To rerun your failures please run 'make mochitest-plain-rerun-failures'". r=ted 2012-04-24 12:57:50 -04:00
Jonathan Griffin
ac6701a55b Bug 738766 - Marionette's log() now also dump()'s, r=mdas 2012-03-27 13:48:46 -07:00
Masayuki Nakano
941d39a6a6 Bug 722961 Add tests for autocomplete with composition r=m_kato 2012-03-27 23:22:56 +09:00
Armen Zambrano Gasparnian
2f316b60d9 Bug 739345 - update new talos.zip with fixed permissions for minidump_stackwalk. r=jmaher 2012-03-27 10:11:30 -04:00
Jonathan Griffin
b40725a054 Bug 738825 - mirror Marionette Python client into gecko, a=testonly (npotb) 2012-03-26 12:40:25 -07:00
Armen Zambrano Gasparnian
dfe05c1f66 Bug 715193. Match talos.zip from mobile and desktop. r=jmaher 2012-03-26 15:23:21 -04:00
Matt Brubeck
d6bfad0407 Merge mozilla-central and mozilla-inbound 2012-03-23 16:06:54 -07:00
Joel Maher
9fedad652a Bug 737458 - add tp5row and cleanup config.py. r=armenzg 2012-03-23 10:47:10 -04:00
Joel Maher
9ebdd062f8 Bug 712643 - land Marionette on m-c. r=mossop,robcee 2012-03-22 11:19:57 -04:00
Joel Maher
bd5f2d8dcf Bug 736920 - mochitest-robocop log parser shouldn't repeat the whole test log, particularly not with spurious blank lines. r=gbrown 2012-03-22 10:45:20 -04:00
Artur Adib
58935f6689 Bug 714712 - Part 2: pdf.js test. r=gavin 2012-03-21 22:25:06 -04:00
Aryeh Gregor
c26ee0dc67 Bug 735805 part 5 - Mochitests that run no tests should fail; r=jmaher 2012-03-16 16:07:16 -04:00
Aryeh Gregor
92f21e9c4c Bug 736529 - Calling waitForFocus() and then finishing before you get focus should cause the test to fail; r=jmaher 2012-03-19 13:09:48 -04:00
Jacek Caban
e2422b317a Bug 736980 - testing/tools/screenshot fails to link on mingw r=khuey 2012-03-21 17:25:29 +01:00
Henri Sivonen
526035785c Bug 737013 - Expose sanitizer fragments on parseFragment(), migrate callers to the new interface. r=smaug. 2012-03-20 17:28:42 +02:00
Paolo Amadini
3ee0f44360 Bug 728143 - Replace old synchronous favicons calls in Places tests. r=mak 
--HG--
rename : toolkit/components/places/tests/unit/expected-favicon-big16.ico.png => toolkit/components/places/tests/favicons/expected-favicon-big16.ico.png
rename : toolkit/components/places/tests/unit/expected-favicon-big32.jpg.png => toolkit/components/places/tests/favicons/expected-favicon-big32.jpg.png
rename : toolkit/components/places/tests/unit/expected-favicon-big4.jpg.png => toolkit/components/places/tests/favicons/expected-favicon-big4.jpg.png
rename : toolkit/components/places/tests/unit/expected-favicon-big48.ico.png => toolkit/components/places/tests/favicons/expected-favicon-big48.ico.png
rename : toolkit/components/places/tests/unit/expected-favicon-big64.png.png => toolkit/components/places/tests/favicons/expected-favicon-big64.png.png
rename : toolkit/components/places/tests/unit/expected-favicon-scale160x3.jpg.png => toolkit/components/places/tests/favicons/expected-favicon-scale160x3.jpg.png
rename : toolkit/components/places/tests/unit/expected-favicon-scale3x160.jpg.png => toolkit/components/places/tests/favicons/expected-favicon-scale3x160.jpg.png
rename : toolkit/components/places/tests/unit/favicon-big16.ico => toolkit/components/places/tests/favicons/favicon-big16.ico
rename : toolkit/components/places/tests/unit/favicon-big32.jpg => toolkit/components/places/tests/favicons/favicon-big32.jpg
rename : toolkit/components/places/tests/unit/favicon-big4.jpg => toolkit/components/places/tests/favicons/favicon-big4.jpg
rename : toolkit/components/places/tests/unit/favicon-big48.ico => toolkit/components/places/tests/favicons/favicon-big48.ico
rename : toolkit/components/places/tests/unit/favicon-big64.png => toolkit/components/places/tests/favicons/favicon-big64.png
rename : toolkit/components/places/tests/unit/favicon-normal16.png => toolkit/components/places/tests/favicons/favicon-normal16.png
rename : toolkit/components/places/tests/unit/favicon-normal32.png => toolkit/components/places/tests/favicons/favicon-normal32.png
rename : toolkit/components/places/tests/unit/favicon-scale160x3.jpg => toolkit/components/places/tests/favicons/favicon-scale160x3.jpg
rename : toolkit/components/places/tests/unit/favicon-scale3x160.jpg => toolkit/components/places/tests/favicons/favicon-scale3x160.jpg
rename : toolkit/components/places/tests/unit/head_bookmarks.js => toolkit/components/places/tests/favicons/head_favicons.js
rename : toolkit/components/places/tests/unit/test_favicons.js => toolkit/components/places/tests/favicons/test_favicons.js
rename : toolkit/components/places/tests/unit/test_moz-anno_favicon_mime_type.js => toolkit/components/places/tests/favicons/test_moz-anno_favicon_mime_type.js
rename : toolkit/components/places/tests/unit/test_doReplaceFaviconData.js => toolkit/components/places/tests/favicons/test_replaceFaviconData.js
rename : toolkit/components/places/tests/unit/test_doReplaceFaviconDataFromDataURL.js => toolkit/components/places/tests/favicons/test_replaceFaviconDataFromDataURL.js
 2012-03-19 20:24:21 +01:00
Matt Brubeck
fea435128b Back out f626859690df (bug 736105) because of frequent robocop testAboutPage failures 2012-03-19 11:28:58 -07:00
Joel Maher
13daf48608 Bug 736105 - robocop does a lot of redundant copying of profile and sleeps, we can cut runtime almost in half. r=wlach,gbrown 2012-03-19 11:09:36 -04:00
Ehsan Akhgari
9fb965340a Merge from mozilla-central 2012-03-17 12:32:28 -04:00
Phil Ringnalda
59e91c4455 No bug, update jetpack revision being tested, r=kwierso 2012-03-16 21:01:41 -07:00
William Lachance
44bd779b0f Bug 736246 - DeviceManagerADB should throw an exception if we know it's not going to work. r=jmaher 2012-03-16 18:36:28 -04:00
Gavin Sharp
7689926494 Bug 589668: take screenshots on test failures on Windows, screenshot utility written by Ted Mielczarek <ted.mielczarek@gmail.com>, build goop by me and jhford, r=khuey 
--HG--
extra : transplant_source : %2A%07%B3w%DEg%DB%99%7EQR8Wq/%96J%E8%8D%D8
 2012-02-08 12:30:07 -08:00
Kyle Machulis
8b59e0537f Bug 735017: Clean up namespaces and naming for gonk dom objects in gonk specific code - Patch 1: Change dom/system/b2g to dom/system/gonk; r=philikon 
--HG--
rename : dom/system/b2g/AudioManager.cpp => dom/system/gonk/AudioManager.cpp
rename : dom/system/b2g/AudioManager.h => dom/system/gonk/AudioManager.h
rename : dom/system/b2g/GonkGPSGeolocationProvider.cpp => dom/system/gonk/GonkGPSGeolocationProvider.cpp
rename : dom/system/b2g/GonkGPSGeolocationProvider.h => dom/system/gonk/GonkGPSGeolocationProvider.h
rename : dom/system/b2g/Makefile.in => dom/system/gonk/Makefile.in
rename : dom/system/b2g/RadioInterfaceLayer.js => dom/system/gonk/RadioInterfaceLayer.js
rename : dom/system/b2g/RadioInterfaceLayer.manifest => dom/system/gonk/RadioInterfaceLayer.manifest
rename : dom/system/b2g/SystemWorkerManager.cpp => dom/system/gonk/SystemWorkerManager.cpp
rename : dom/system/b2g/SystemWorkerManager.h => dom/system/gonk/SystemWorkerManager.h
rename : dom/system/b2g/net_worker.js => dom/system/gonk/net_worker.js
rename : dom/system/b2g/nsIAudioManager.idl => dom/system/gonk/nsIAudioManager.idl
rename : dom/system/b2g/nsIRadioInterfaceLayer.idl => dom/system/gonk/nsIRadioInterfaceLayer.idl
rename : dom/system/b2g/nsIWorkerHolder.idl => dom/system/gonk/nsIWorkerHolder.idl
rename : dom/system/b2g/nsRadioInterfaceLayer.h => dom/system/gonk/nsRadioInterfaceLayer.h
rename : dom/system/b2g/ril_consts.js => dom/system/gonk/ril_consts.js
rename : dom/system/b2g/ril_worker.js => dom/system/gonk/ril_worker.js
rename : dom/system/b2g/systemlibs.js => dom/system/gonk/systemlibs.js
rename : dom/system/b2g/tests/header_helpers.js => dom/system/gonk/tests/header_helpers.js
rename : dom/system/b2g/tests/test_ril_worker_buf.js => dom/system/gonk/tests/test_ril_worker_buf.js
rename : dom/system/b2g/tests/test_ril_worker_sms.js => dom/system/gonk/tests/test_ril_worker_sms.js
rename : dom/system/b2g/tests/xpcshell.ini => dom/system/gonk/tests/xpcshell.ini
 2012-03-14 15:42:31 -07:00
Ed Morley
f558fef737 Backout ba7da6256b23 (bug 726444) for talos regressions; a=mak 2012-03-11 23:38:53 +00:00
Paolo Amadini
2a53c9bbe4 Bug 726444 - Implement the Downloads Panel. r=mak ui-r=limi 
Includes: Bug 697679 - By Javi Rueda <leofigueres@yahoo.com>.
 2012-03-10 15:00:45 +01:00
Luke Wagner
4451654360 Bug 732308 - fix potential leak in xpcshell/head.js (r=jmaher) 2012-03-02 09:36:53 -08:00
Marco Bonardo
3606a4771c Bug 591884 - Make IE importer fallback to the default Links folder to support toolbar favorites in versions >= 7 
r=felipe
 2012-03-09 11:13:14 +01:00
Matt Brubeck
788b29276e Merge mozilla-central to mozilla-inbound 2012-03-08 16:27:40 -08:00
Jeff Hammel
2d47ce2068 Bug 727903. Remove pageloader.xpi from talos_from_code.py. r=armenzg 2012-03-08 09:52:51 -05:00
Jason Duell
e0c0758849 Bug 732657: runxpcshell.py doesn't fail e10s tests if child process aborts/crashes. r=jmaher 2012-03-08 15:00:05 -08:00
Marco Bonardo
7a53ebb551 Merge inbound and central 2012-03-07 10:33:11 +01:00
Gregory Szorc
79d05cf994 Bug 729098 - Part 1.01/2 - Fix xpcshell test bustage; r=bustage 2012-03-06 16:27:22 -08:00
Gregory Szorc
9474ae8763 Bug 729098 - Part 1/2: Create xUnit XML results file when executing xpcshell tests; r=khuey 2012-03-06 15:03:34 -08:00
Bobby Holley
3f3ca5637d Bug 731442 - Back out f9145dab4be9 (bug 718543) due to test failures. r=backout 2012-03-06 11:05:29 -08:00
Joel Maher
9c15f61b3c Bug 732835 - Deploy new talos.zip to fix 732655 and 732656. r=armenzg 2012-03-05 11:03:11 -05:00
Justin Dolske
663f83149e Bug 731093 - Make head.js code should just look for just |e.filename| so that a non-object exception is logged when thrown from a test. r=jmaher 2012-03-03 22:19:04 -05:00
Mark Cote
b0a41f1c3a Bug 730422 - test_contextMenu.js errors out on all platforms except Linux/Linux64. r=jmaher 2012-03-01 11:20:42 -05:00
Joel Maher
3bdf42511f Bug 731893 - update talos.zip to include adjustment to mozafterpaint for ts and ts_paint. r=armenzg 2012-03-01 11:18:46 -05:00
Ryan VanderMeulen
95e442c979 Merge m-c to inbound. 2012-05-09 18:42:00 -04:00
Mark Cote
907e962876 Bug 753099 Update peptest to work with global compartments change r=ctalbert 2012-05-09 13:59:31 -07:00
Jonathan Griffin
b02b12373c Bug 751406 - Update tests which expect calling Components.classes to fail, a=test-only, DONTBUILD because NPOTB 2012-05-09 11:48:45 -07:00
Geoff Brown
f947e06a8c Bug 705192: allow remotexpcshelltests.py to execute xpcshell via SUT agent; r=jmaher 2012-02-28 12:20:56 -05:00
Phil Ringnalda
60039c1f79 No bug - update revision of Add-on SDK being tested, rs=kwierso, npotvb DONTBUILD 2012-02-27 20:47:29 -08:00
Gregory Szorc
61a4da28da Bug 725478 - Support for generating xUnit result files from xpcshell tests; r=Waldo 2012-02-27 19:53:00 -08:00
Ed Morley
1a1c058c5a Backout 88d02a07d390, 5f903f5a84a8 & 3539be41fa6b (bug 725478) for make-check failures 2012-02-28 01:04:35 +00:00
Gregory Szorc
80e7e8a3e7 Fix bug 725478 because we run a buggy Python released almost 5 years ago; r=tigerblood 2012-02-27 16:15:59 -08:00
Gregory Szorc
6c2b16a1a1 Bug 725478 - Fix possible access on None; r=losing 2012-02-27 15:32:56 -08:00
Gregory Szorc
23e82ea5a7 Bug 725478 - Ability to produce xUnit XML result files from xpcshell test Python driver; r=Waldo 2012-02-27 14:58:04 -08:00
Tim Taubert
b39c293440 merge m-c to fx-team 2012-02-26 19:15:38 +01:00
Tim Taubert
2cfabea640 Bug 683953 - Part 1 - Parse log output and collect statistics about leaked DOMWindows and DocShells; r=ted 2012-02-25 12:48:05 +01:00
Brian R. Bondy
b8ba18b5b0 Bug 725180 - Create test suite for libmar. r=rstrong 2012-02-24 16:29:42 -05:00
Jonas Sicking
64f741219e Bug 722626: Implement DOMRequest object. r=mrbkap 2012-02-24 14:19:49 +01:00
Ed Morley
04577d02d6 Merge mozilla-central to mozilla-inbound 2012-02-23 01:03:16 +00:00