Commit Graph

1821 Commits

Author SHA1 Message Date
Dão Gottwald
9b15b69a1b Backed out changeset 59ace8d80ce8 2010-07-04 22:01:13 +02:00
Saint Wesonga
8dd5da1024 Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedberg 2010-07-04 21:39:17 +02:00
Chris Jones
7dc26b1584 Bug 576680: Initialize |rv| so that valgrind doesn't complain (though it's technically unnecessary) and add a helper function to cut some LoC. r=dwitte 2010-07-02 22:03:18 -05:00
Jesse Ruderman
14ecbf3e68 Add bug numbers for all remaining asserts() annotations in crashtests and reftests 2010-07-01 19:33:56 -07:00
Josh Aas
7c2ba6e19d Bug 542971, bug 577985: Includes a number of plugin module memory mgmt fixes. Remove/replace nsPluginInstanceTag (instance tags), stop storing the plugin library and function table twice. r=jst 2010-07-19 22:11:26 -04:00
Chris Jones
d37c23f270 Bug 578262: Clean up style in and remove build warnings from new-ishly merged e10s code. r=bsmedberg
--HG--
rename : dom/ipc/ContentProcessChild.cpp => dom/ipc/ContentChild.cpp
rename : dom/ipc/ContentProcessChild.h => dom/ipc/ContentChild.h
rename : dom/ipc/ContentProcessParent.cpp => dom/ipc/ContentParent.cpp
rename : dom/ipc/ContentProcessParent.h => dom/ipc/ContentParent.h
rename : dom/ipc/ContentProcessProcess.cpp => dom/ipc/ContentProcess.cpp
rename : dom/ipc/ContentProcessProcess.h => dom/ipc/ContentProcess.h
rename : dom/ipc/PIFrameEmbedding.ipdl => dom/ipc/PBrowser.ipdl
rename : dom/ipc/PContentProcess.ipdl => dom/ipc/PContent.ipdl
2010-07-19 13:33:33 -05:00
Josh Aas
4e23705cc3 Bug 579516: Patch contains a number of fixes to nsPluginStreamListenerPeer memory management. Also moves storage of the stream array for cache lookups to the plugin instance rather than the instance tag. Also stops adding streams to the cached list that shouldn't be there. r=benwa 2010-07-17 19:47:29 -04:00
Josh Aas
106040179d Improve memory mgmt and reduce COM pointer type usage in plugin stream code. b=578913 r=benwa (re-landing, did not cause Ts Shutdown regression) 2010-07-16 15:55:54 -04:00
Josh Aas
a3aefb5e98 Backed out changeset 764bb4ae886c, bug 578913, it may be at fault for a Ts Shutdown regression. 2010-07-16 13:25:01 -04:00
Josh Aas
41ff002705 Improve memory mgmt and reduce COM pointer type usage in plugin stream code. b=578913 r=benwa 2010-07-15 22:30:07 -04:00
Robert O'Callahan
7f603b4ac1 Bug 564991. Part 37: Add test plugin API to make the plugin invalidate itself during each paint. r=josh 2010-07-16 09:08:11 +12:00
timeless@mozdev.org
8ad4980739 Bug 577230 nsJPEGEncoder::mImageBufferReadPoint will be initialized after nsJPEGEncoder::mFinished
r=jmuizelaar

--HG--
extra : rebase_source : 4749619bdf1ffad836353da6d22a9f37377d8080
2010-07-07 12:38:40 +03:00
timeless@mozdev.org
9868ec7503 Bug 577992 warning: unused variable ‘isSentinel’ in imgDiscardTracker::Reset
r=bholley

--HG--
extra : rebase_source : 790bb046a21e45ca79c23cfc522cf89430467f8b
2010-07-15 15:55:04 +03:00
Dão Gottwald
844a6ea7d9 remove bogus test for bug 521495 2010-07-15 11:35:33 +02:00
Nils Maier
bc6be3b7e3 Bug 521495 - moz-icon:// protocol does not work with SVG icons. r=joe
--HG--
extra : rebase_source : 4db9f6f86c2a2811d2b21dc28a4ede4216f4e705
2010-07-15 10:14:11 +02:00
Vladimir Vukicevic
79bbb0f9ca b=571172; import and use ANGLE GLSL ES shader validator (disabled by default for now); r=joe 2010-07-14 20:52:34 -07:00
Blake Kaplan
3ca0e8e3e3 Fix bustage from bug 578392 (r=sayrer on the bustage fix). 2010-07-14 17:39:22 -07:00
Blake Kaplan
febd9cf0bc Bug 578392 - Don't assume things about comparing non-nsISupports pointers. r=bsmedberg 2010-07-14 16:06:17 -07:00
Bobby Holley
1bd914f84a Added some checks for the random orange in bug 578591.r=joe 2010-07-14 13:53:01 -04:00
Robert Sayre
4ed4f1f76a merge tracemonkey to mozilla-central. 2010-07-14 06:00:32 -07:00
Josh Aas
74d7a05a98 Move nsPluginStreamListenerPeer to its own files, clean up the plugin host. b=578447 r=benwa 2010-07-13 16:48:00 -04:00
Josh Aas
d581ec02fb Move nsNPAPIPluginStreamListener implementation to its own file. b=578383 r=jst 2010-07-13 14:42:03 -04:00
Bobby Holley
4fa9fdbc7e Tests for bug 478398, as well as for a few others, now that we have a discard timer pref.r=joe 2010-07-13 13:30:39 -04:00
Josh Aas
1b1a81fc4a Remove nsPluginCacheListener, it is unused. b=578285 r=benwa 2010-07-13 02:58:30 -04:00
Joe Drew
dce4fe07b6 Bug 572520: step 6, centralize the tracking of load/decode status. Make a single class, imgStatusTracker, which keeps track of the state of an image, and also takes care of calling notifications on imgRequestProxys. r=jrmuizel,bholley 2010-05-14 16:47:59 -04:00
Joe Drew
92722f5a0a Bug 572520: step 5, remove imgContainerRequest because it duplicates the body of NotifyProxyListener. Put its required abilities into imgRequestProxy and imgContainer. r=jrmuizel 2010-05-10 23:27:41 -04:00
Joe Drew
2dcfdc1cef Bug 572520: step 4, don't restart animation in NotifyProxyListener, do it in AddProxy instead. r=jrmuizel,bholley 2010-05-10 23:25:11 -04:00
Joe Drew
e6a143b60a Bug 572520: step 3, remove unused parameters on imgRequestProxy::on*. r=jrmuizel,bholley 2010-05-10 23:25:11 -04:00
Joe Drew
a66fc6b5d5 Bug 572520: step 1, undef LoadImage all over the place. r=jrmuizel,bholley 2010-07-28 14:51:37 -07:00
Benjamin Smedberg
5aea5bb4c0 Bug 582012 - register identifiers in the ID maps when they are created by the browser, so that a plugin never sees two identifiers for the same string/integer, r=bent 2010-07-28 13:20:33 -04:00
Ilpo Ruotsalainen
820e122c88 Bug 489142 - Use fastpath in JPEG decoder when CMS mode is tagged-only. r=joedrew, approval2.0=benjamin
--HG--
extra : rebase_source : 7759b352b6b39c2fd6407e0614cbd342fd4f84db
2010-07-16 14:05:40 -07:00
Brad Lassey
5afbe59d01 bug 580921 - debug android builds fail with undefined symbols z_verbose and z_error r=khuey 2010-07-22 15:17:15 -04:00
Glenn Randers-Pehrson
9def47a86c Bug 564792 - Update libpng to version 1.4.3. r=joe 2010-07-22 09:00:30 +02:00
Brad Lassey
da3bcb01d0 bug 576997 - Need to upgrade in-tree FreeType to 2.4.0 once it has been released r=bsmedberg b=2.0+ 2010-07-21 12:59:38 -04:00
Steven Michaud
a54789cbe5 Bug 577967 - Crash [@ NSAddImage ] on startup on 2.0 branch. r=josh 2010-07-21 11:27:13 -05:00
Chris Jones
15db514e63 Temporarily disable plugin crash submission tests. See bug 573290 2010-07-01 20:01:09 -05:00
Benjamin Smedberg
b164ed30f3 Followup to bug 568691 landing, QT-specific JS component on a CLOSED TREE. 2010-07-01 15:44:46 -04:00
Benjamin Smedberg
a249678c04 Final merge and landing of bug 568691 and dependent bugs to mozilla-central on a CLOSED TREE.
* bug 568691, register XPCOM components statically using manifests. r=mossop, with some test and build stuff r=vlad,sdwilsh
* bug 573557, rename categories with spaces to use hypens. r=jst
* bug 573739, Don't get the private browsing service during layout module initialization, r=ehsan

This initial merge does not include some work planned to land imminently:
* The extension manager still restarts. I need to solve a problem re-reading default preferences from extensions.
* MOZ_OMNIJAR is broken: there is a patch which I need to update in bug 568691.
* I will concurrently land a mobile-browser fix for component registration, but it may require some additional packaging changes.
2010-07-01 14:26:25 -04:00
Bobby Holley
83147284c8 Bug 502694 - Images should not have individual discard timers.r=jrmuizel 2010-07-01 10:39:44 -07:00
Benjamin Smedberg
4d172dd53d Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691. 2010-07-01 11:55:57 -04:00
Benjamin Smedberg
a2833452f8 Merge mozilla-central to the bug 568691 branch.
--HG--
rename : gfx/public/nsITheme.h => gfx/src/nsITheme.h
2010-06-30 14:23:23 -04:00
Zack Weinberg
a55cf984ba Bug 571989 follow-up: remove mentions of removed directories from toolkit-makefiles.sh and elsewhere. r=dholbert
--HG--
extra : rebase_source : c6e387430e6b2292b0925fdb681819ba109568e7
2010-06-30 08:54:39 -07:00
Ted Mielczarek
1dc201bc7a bug 574357 followup, don't run the new test on platforms where we don't build crashreporter. Should also fix bug 574118. r=bsmedberg 2010-06-30 11:10:46 -04:00
Ted Mielczarek
17362ddaa6 bug 574357 - Plugin crash reports are submitted with Throttleable=0. r=dolske
--HG--
rename : modules/plugin/test/mochitest/test_crash_notify_no_report.xul => modules/plugin/test/mochitest/test_crash_submit.xul
2010-06-30 10:29:05 -04:00
Justin Dolske
157f21c04d Backed out changeset e112f68bc941 (bug 574357) due to test failures. 2010-06-29 22:45:30 -07:00
Ted Mielczarek
1ff7a5c880 bug 574357 - Plugin crash reports are submitted with Throttleable=0. r=dolske
--HG--
rename : modules/plugin/test/mochitest/test_crash_notify_no_report.xul => modules/plugin/test/mochitest/test_crash_submit.xul
2010-06-29 19:34:39 -04:00
Benjamin Smedberg
c71e024222 Bug 574457 - Back out the functional changes from revision 0327e126ea24, bug 569644, because of 100ms (20%) Ts regression on Linux/Mac. This leaves the nsIContentUtils helper function, but restores the plugin host category entry munging. 2010-06-29 16:56:13 -04:00
Benjamin Smedberg
63c0077443 Merge mozilla-central into the branch for bug 568691, including fixup of the new jetpack binary module. 2010-06-25 19:41:09 -04:00
Jeff Muizelaar
c4f1d3499c Bug 570451 - Avoid adding unneeded lines to image; r=joe sr=vlad 2010-06-25 15:20:18 -04:00
Bobby Holley
36d9272186 Bug 517119 - Preallocate image source data buffer based on Content-Length.r=jrmuizel,sr=vlad. 2010-06-25 11:21:40 -07:00
Benjamin Smedberg
762def30bb Merge mozilla-central into the static-xpcom-registration branch. 2010-06-23 17:26:25 -04:00
Kyle Huey
1b22082b07 Bug 567426: Make image encoders implement nsIAsyncInputStream. r=joedrew sr=bz 2010-06-23 10:24:56 -07:00
Ginn Chen
afb9960ccd Bug 572999 Make reftest recognize Solaris r=roc 2010-06-23 17:33:21 +08:00
Benjamin Smedberg
45af085fff Merge mozilla-central into the "branch" for but 568691. The omnijar XPT/component/chrome registration was removed during this merge, and will be re-added to the component manager shortly.
--HG--
rename : content/base/public/nsIChromeRegistry.idl => chrome/public/nsIChromeRegistry.idl
2010-06-21 11:41:42 -04:00
Robert Sayre
198f8e9ae3 Bug 576033 - Accept-Encoding syntax causes upstream cache inefficiency. r=jduell 2010-07-01 08:15:55 -07:00
Chris Jones
bf91852da6 Bug 572295: Add X11Util.h for X11 toolkits. r=karlt,joedrew 2010-06-21 15:35:49 -05:00
Benjamin Smedberg
f13550a209 Bug 568691 part B - mechanical changes to in-tree binary modules needed to get them building and registering correctly. After this patch, xpcshell appears to work. 2010-06-10 14:11:40 -04:00
Benjamin Smedberg
c729bcd681 Bug 570488 part B - fix and test loading XPT files from JARs, needed for omnijar, r=mwu 2010-06-10 12:51:43 -04:00
Benjamin Smedberg
80b423e0a0 Bug 569644 - Query the plugin host directly when searching for MIME types, rather than using Gecko-Content-Viewer category manager registration, r=bz 2010-06-10 12:42:16 -04:00
Dão Gottwald
b314909c2e Backed out changeset db6f8068e9a5 2010-06-29 17:49:21 +02:00
Saint Wesonga
c3669d7e9c Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedgerg 2010-06-29 17:14:36 +02:00
Jesse Ruderman
00adb2a3db Disable test that incorrectly relies on timing (bug 558678) 2010-06-27 21:31:42 -07:00
Justin Dolske
80c9fa8aef Bug 574905 - Increase hang detector timeout. r,sr=shaver 2010-06-26 14:45:56 -07:00
Doug Turner
ba5d48b7ab merge with mc 2010-06-30 10:50:45 -07:00
Doug Turner
c92986c46a Merge from mc 2010-06-29 14:39:57 -07:00
Doug Turner
901e02b2de Merging with mozilla-central. Manually merged: content/canvas/src/nsCanvasRenderingContext2D.cpp ipc/ipdl/Makefile.in toolkit/toolkit-tiers.mk toolkit/xre/nsEmbedFunctions.cpp
--HG--
rename : gfx/thebes/src/gfxSharedImageSurface.cpp => gfx/thebes/gfxSharedImageSurface.cpp
rename : gfx/thebes/public/gfxSharedImageSurface.h => gfx/thebes/gfxSharedImageSurface.h
2010-06-28 16:33:19 -07:00
Doug Turner
4719dd0705 Automerge w mozilla-central 2010-06-24 14:06:13 -07:00
Bobby Holley
d60f7b7849 Bug 573629 - gDiscardable and gDecodeOnDraw should be prefs. r=vlad 2010-06-24 11:33:34 -07:00
Gervase Markham
24a3e6947e Bug 564214 - Add .<Emarat> to IDN whitelist. 2010-06-24 13:09:05 +01:00
Jason Duell
d194b9d486 Merge from m-c.
Fair amount of merge conflicts.

Biggest item was changes to nsHttpChannel from web sockets changes.

Other likely suspects if things are borken:

nsFrameLoader.cpp:
    - nsFrameLoader::EnsureMessageManager: pass "this" (orig e10s code) or
      nsnull (m-c) to local process call to new nsFrameMessageManager(),
      callback arg?  Smaug said null.
    - only calling SetCallBackData for local case.  also +r smaug.

nsPrefBranch.cpp had fairly extensive merge conflicts.

nsChromeRegistry had lots of changes.

Dougt did most of the non-necko changes (thanks).

--HG--
rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h
2010-06-22 17:33:57 -07:00
Frederic Plourde<frederic.plourde@polymtl.ca>
d5bc5bdad9 Bug 569270 - Assertion on child process shutdown in xpcshell. r=dwitte 2010-06-08 07:57:47 -04:00
Doug Turner
ded51c1c5f Merging with M-C.
Hand merged the following files:

U chrome/src/nsChromeRegistry.cpp
U chrome/src/nsChromeRegistry.h
U content/base/src/nsFrameLoader.cpp
U content/base/src/nsFrameLoader.h
U dom/src/geolocation/nsGeolocation.cpp
U dom/src/geolocation/nsGeolocation.h
U netwerk/build/Makefile.in
U netwerk/cookie/nsCookieService.cpp
U netwerk/cookie/nsCookieService.h

--HG--
rename : extensions/cookie/test/unit/test_cookies.js => extensions/cookie/test/unit/test_cookies_thirdparty.js
rename : netwerk/cookie/src/nsCookieService.cpp => netwerk/cookie/nsCookieService.cpp
rename : netwerk/cookie/src/nsCookieService.h => netwerk/cookie/nsCookieService.h
rename : netwerk/dns/src/nsIDNKitInterface.h => netwerk/dns/nsIDNKitInterface.h
rename : netwerk/protocol/http/src/nsHttp.h => netwerk/protocol/http/nsHttp.h
rename : netwerk/protocol/http/src/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannel.cpp
rename : netwerk/protocol/http/src/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannel.h
rename : netwerk/protocol/http/src/nsHttpChunkedDecoder.h => netwerk/protocol/http/nsHttpChunkedDecoder.h
rename : netwerk/protocol/http/src/nsHttpHandler.cpp => netwerk/protocol/http/nsHttpHandler.cpp
rename : netwerk/protocol/http/src/nsHttpHeaderArray.h => netwerk/protocol/http/nsHttpHeaderArray.h
rename : netwerk/protocol/http/src/nsHttpRequestHead.h => netwerk/protocol/http/nsHttpRequestHead.h
rename : netwerk/protocol/http/src/nsHttpResponseHead.h => netwerk/protocol/http/nsHttpResponseHead.h
rename : netwerk/protocol/http/src/nsHttpTransaction.cpp => netwerk/protocol/http/nsHttpTransaction.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.cpp => netwerk/protocol/res/nsResProtocolHandler.cpp
rename : netwerk/protocol/res/src/nsResProtocolHandler.h => netwerk/protocol/res/nsResProtocolHandler.h
2010-06-07 13:38:02 -07:00
Dan Witte
903768fcbf Bug 565475 - Allow 3rd party cookies for session only. r=sdwilsh 2010-06-07 12:32:12 -07:00
Dan Witte
55ad01989c Bug 568644 - e10s: remote nsIPrefBranch::GetChildList(). r=jdm 2010-05-28 11:09:15 -07:00
Dan Witte
da0d782360 Bug 568270 - e10s: remote nsPrefService. r=jdm 2010-05-26 12:30:03 -07:00
Dan Witte
e8ae0a2d75 Bug 568271 - e10s: remote nsIPrefBranch::GetComplexValue(). Part 2: assert on pref set. r=jdm 2010-05-26 12:29:29 -07:00
Dan Witte
67faf49ae3 Bug 568271 - e10s: remote nsIPrefBranch::GetComplexValue(). Part 1: remote it. r=jdm 2010-05-26 12:29:15 -07:00
Frederic Plourde
86ad264938 Bug 506269 - Electrolysis: implement IPC remoting for preferences. r=dwitte 2010-05-25 17:13:47 -07:00
Frederic Plourde
1fe33c9221 Bug 566869 - prefapi.h does not like Chromium's prtypes.h. r=bsmedberg 2010-05-25 17:13:47 -07:00
timeless@mozdev.org
50835b5fc6 Bug 563200 fix deprecated conversion and comparison between signed and unsigned in testplugin/nptest.cpp. r=jst
--HG--
extra : rebase_source : 79958d664a02ad215198770a0c979b21ba3fca24
2010-05-23 15:32:42 -07:00
Jonathan Kew
162e51adfa Bug 569531 - Enable harfbuzz by default for simple scripts on Mac OS X only; r=roc 2010-06-23 19:38:04 -04:00
Michael Wu
49ab4956d1 Bug 566686 - Provide a decompression API in nsZipArchive, patch mostly by taras, r=alfredkayser 2010-06-04 14:10:23 -07:00
Jeff Muizelaar
e88bb567f0 Bug 548612. qcms: Reduce size of output lookup tables. r=bgirard
We currently use a larger output lookup table than we probably need. Switch to
a common define for the table size and lower it. The should also give a small
improvement to startup time because we have fewer lookup table entries to
compute.
2010-06-04 14:48:30 -04:00
Kyle Huey
60c5aa6fd2 Backed out changeset f54e6386c113
--HG--
extra : rebase_source : 367bf92e0875df1663e79bd6b968cddd677eeb1c
2010-06-19 13:19:25 -07:00
Olli Pettay
53e6959961 bug 472529, enable websockets
--HG--
extra : rebase_source : faa68acf9ef72d38fdcf1937381cf9edeaafb29c
2010-06-17 22:01:50 +03:00
wfernandom2004@gmail.com
7b192188c1 Bug 472529, websockets (protocol v75), r=smaug+biesi
--HG--
rename : netwerk/protocol/http/nsHttpChannel.cpp => netwerk/protocol/http/nsHttpChannelAuthProvider.cpp
rename : netwerk/protocol/http/nsHttpChannel.h => netwerk/protocol/http/nsHttpChannelAuthProvider.h
extra : rebase_source : 44e45b23f85ec0095677233cdbd970c33b0c87b4
2010-06-17 21:34:24 +03:00
Matt Brubeck
6a655f5de1 Bug 568700 - Font aliases and defaults for Android, r=vlad
--HG--
extra : rebase_source : 0c5b021d2d8bacbfdb3fda6704ce0c6c8ced5d78
2010-06-17 16:45:55 -07:00
Karl Tomlinson
47021e2a65 b=526941 don't let (level=parent) popups accept focus but transfer focus to the parent r=enndeakin
--HG--
extra : rebase_source : 6c64e2a0b7ebb7f659f4dc0f0378fdffcc6880db
2010-06-18 13:15:03 +12:00
Jesse Ruderman
f04ef428cb Remove stray line breaks from NS_ERROR messages, since they interfere with log processing. rs=jst
--HG--
extra : rebase_source : 87421691da969e0ebe5fbfbc44cd8f18617d1351
2010-06-17 13:28:38 -07:00
Kyle Huey
5746184f5d Bug 508082: Implement a raw video decoder. r=doublec
--HG--
extra : rebase_source : 2ffc36ceb9cb8407531efa6e7b1f0548e81c170c
2010-06-17 17:36:57 -07:00
Neil Rashbrook
9b48d90832 Bug 570002 Allow moz-icon://file:/// URIs again as download manager etc. use it r=joedrew 2010-06-17 12:27:14 +01:00
Matthew Gregan
7440095223 Bug 572235 - Increase default media cache size from 50MB to 500MB. r=roc 2010-06-16 11:12:38 +12:00
Glenn Randers-Pehrson
704aba7d66 Bug 433047 - Rendering artifacts in APNG frame. r=joedrew 2010-06-16 18:54:18 +02:00
Vivien Nicolas
27fdccc31f Bug 563329 - Add a preference to enable/disable click hold context menus [r=smaug] 2010-06-16 09:36:11 +02:00
Josh Aas
b8977580e4 Sync NPAPI headers to npapi-headers repository r27. b=571538 r=jst r=mstange 2010-06-15 15:34:32 -04:00
Benjamin Smedberg
3fcaf094f4 Bug 570488 - Fix loading of XPTs nested in JARs [2/2] r=mwu
--HG--
extra : rebase_source : b97a591c0260daed1f2ef2eba69e60ff82acd18f
2010-06-14 16:10:04 -07:00
Joe Drew
98f411e39e Bug 388195 - Remove gopher support. r=jduell,gavin sr=bz 2010-04-16 17:05:47 -04:00
Ehsan Akhgari
3d4fdd49ef Revert the default cache size to 50MB because of Tp4 regressions on Windows 7 (bug 569709) 2010-06-14 14:59:03 -04:00
Ehsan Akhgari
228a906f8f Bug 569709 - Figure out the max number of entries we should store in the disk cache, and bump the default size of the disk cache to 250MB; r=jduell 2010-06-10 22:46:51 -04:00
Glenn Randers-Pehrson
b3979b6582 Bug 551438 - "Require system libpng to be at version 1.4.1 or later" [r=joedrew]
--HG--
extra : rebase_source : bd1b6257e157ac5109d3dda738a0b1bc4fd8211e
2010-03-12 09:15:00 -05:00