Commit Graph

352 Commits

Author SHA1 Message Date
Marco Perez
0e63273487 Bug 657715 - Unbreak build for FreeBSD (since it doesn't have libossaudio). r=kinetik 2011-05-19 09:12:25 +12:00
Craig Topper
d3aa297de2 Bug 657548 - Part 2: Remove more unused CIDs. r=jst 2011-05-16 23:46:22 -07:00
Craig Topper
1ff7cbe0ed Bug 657548 part 1. Remove some duplicate and unused CIDs from nsContentCID.h and nsLayoutCID.h. r=jst 2011-05-16 22:25:39 -07:00
Landry Breuil
03a9f25271 Bug 651968. Fix linking with ossaudio, and include soundcard.h instead of sys/soundcard.h on OpenBSD. r=kinetik 2011-05-05 17:12:04 -04:00
Jonathan Kew
916e9b8b24 bug 253317 - part 5 - support none/manual/auto values for -moz-hyphens in layout. r=roc 2011-05-04 12:29:56 +01:00
Kyle Huey
7cc2aa7330 Backed out changeset ea9f9f5503fa 2011-04-27 19:10:01 -04:00
Emanuele Costa
67452a00d1 Bug 647570. Make nsJSURI inherit from nsSimpleURI. r=bzbarsky
--HG--
extra : rebase_source : b3d9b8ed5349e9aabcf08b786951a677b7adcfd9
2011-04-23 05:49:00 -04:00
Justin Lebar
5bc75b222e Bug 647273 - Remove nsIContentUtils and nsIContentUtils2. r=sicking
--HG--
extra : rebase_source : 8a99a1401b7d7427bed4a136e0b38c475f6473a2
2011-04-14 13:58:36 -07:00
Ehsan Akhgari
3bbe7bc47c Bug 617539 - Remove nsIContentUtils_MOZILLA_2_0_BRANCH by backing out changeset 5e1f1bb2bb87 (bug 631412) which had added that class 2011-04-11 16:16:56 -04:00
Matheus Kerschbaum
93480c6366 Bug 639754 - Remove MOZ_IPC checks since IPC is always built now; r=bsmedberg 2011-04-02 19:14:00 -07:00
Jonas Sicking
ca53c7c13a Bug 644476: Rename classes/functions/variables to use "CORS" rather than "Access Control" or "Cross site" where appropriate. r=smaug 2011-03-28 13:18:45 -07:00
Jonas Sicking
b41f2752c4 Bug 644476 Part 2: Move CORS code from nsXMLHttpRequest.cpp/h to nsCrossSiteListenerProxy.cpp/h. r=smaug 2011-03-28 13:11:09 -07:00
Ehsan Akhgari
395dbdf918 Merge cedar into mozilla-central 2011-03-25 14:21:07 -04:00
Matheus Kerschbaum
255f1d6b3c Bug 634807 - Remove MOZ_PLAINTEXT_EDITOR_ONLY; r=khuey 2011-03-24 19:59:00 -04:00
Matheus Kerschbaum
45b3d3567e Bug 640031 - Remove MOZILLA_PLAINTEXT_EDITOR_ONLY; r=ehsan 2011-03-24 19:58:57 -04:00
Robert O'Callahan
0788ccd0dd Bug 638241. Use a cache to avoid redoing SurfaceForElement and DoDrawImageSecurityCheck. r=bzbarsky 2011-03-24 16:13:56 +13:00
L. David Baron
802da587ae Merge layout work from projects/birch, part 2. 2011-03-23 17:39:29 -07:00
Boris Zbarsky
be00decfac Bug 630127. Use a precise timer when we have animation frame callbacks. r=dbaron 2011-03-07 11:58:48 -05:00
Boris Zbarsky
250488127b Bug 457102. Remove vestiges of dead xpointer/fixptr stuff. r=sicking 2011-03-23 10:45:21 -04:00
Benjamin Smedberg
8934cfcee3 Bug 626768 - Add a runtime-abort for recursive layout module initialization, because it is somewhat likely that bugs of this sort could cause the later runtime abort where the cycle collector cannot get the JS runtime service r=bent a=blocker 2011-02-11 16:01:02 -05:00
Justin Wood
bd3654e3bd Bug 589506 - Scrub the codebase of MOZ_VIEW_SOURCE and MOZ_JSLOADER. r+=ted 2010-08-24 23:27:34 -04:00
Ehsan Akhgari
e74b5aed6c Bug 631412 - Bug 629401 breaks non-libxul builds due to unresolved reference to nsContentUtils::DispatchTrustedEvent(nsIDocument*, nsISupports*, nsAString_internal const&, int, int, int*); r=khuey a=NPOTB 2011-02-04 12:00:21 -05:00
Mounir Lamouri
b550e1a0a6 Bug 623482 - Present error page when someone tries to access remote XUL. r+a=sicking
--HG--
extra : rebase_source : 2786e51db70ca0c66f6388376711e74816828c2d
2011-01-14 16:33:57 +01:00
Benjamin Stover
8fc0069a6b Bug 605618 Part 8: Content process map from view IDs to content elements r=cjones sr=roc 2011-01-13 09:45:14 -08:00
Vladimir Vukicevic
0285a9d935 b=578877, reenable WebGL on Linux; r=vlad,a=b 2010-12-27 12:05:01 -08:00
Robert Longson
618ecff833 Bug 617448 - remove svg.enabled as the browser now uses SVG and fails to start if it's disabled r+a=roc 2010-12-08 21:25:06 +00:00
Vladimir Vukicevic
5aa671acea b=603367, disable ANGLE/WebGL on Linux until build system issues are fixed (bug 559964) 2010-12-03 14:44:01 -08:00
Jonas Sicking
6aeb8ea89c Bug 595397: Add a pref to enable XUL and XBL for file:. r=dveditz a=blocker 2010-11-23 00:50:55 -08:00
Brad Lassey
da0df85331 bug 518266 - Implement mechanism to provide haptic feed back, maemo r=dougt a=blocking-fennec
--HG--
extra : rebase_source : d71dd2a0cb525af145126f8b783daf2bd9ee562b
2010-11-22 16:23:40 -05:00
Brad Lassey
f12a85806e bug 518266 - Implement mechanism to provide haptic feed back, android r=dougt a=blocking-fennec 2010-11-22 11:38:02 -05:00
Robert Sayre
2d10c1480d Merge tracemonkey to mozilla-centra. a=blockers. 2010-11-17 13:55:14 -08:00
Jason Orendorff
3fe395d024 Bug 608171 - Make ChromeWorkers available to JSMs. r=bent.
--HG--
extra : rebase_source : 489ea909e324e1809b00ac8a812a68c54a258313
2010-11-16 14:53:47 -06:00
Josh Aas
6094c78eb9 Bug 573873: Fix bug in HTTP handling for plugins. r=jst a=blocking2.0 2010-11-17 14:25:48 -05:00
Vladimir Vukicevic
e8053d8870 b=612334; fix webgl context type; r=bz
--HG--
rename : dom/interfaces/canvas/nsICanvasRenderingContextWebGL.idl => dom/interfaces/canvas/nsIDOMWebGLRenderingContext.idl
2010-11-16 20:33:04 -08:00
Mike Hommey
974d30cc03 Bug 577653 - Allow to build against system libvpx. r=khuey a=roc 2010-11-05 18:24:28 +01:00
Ben Turner
9576024ca0 Bug 596377 - 'IndexedDB: Move usage and clearing IO off the main thread'. r=sicking. 2010-10-19 10:58:33 -07:00
Dan Witte
9a433ac962 Bug 595305 - Factor cookie third-party URI code into separate API. r=bent, a=betaN+ 2010-10-19 09:37:03 -07:00
Michal Novotny
ac7049477a Bug 561085 - Make wyciwyg channel work in e10s. r=dwitte sr=biesi
--HG--
rename : content/html/document/public/nsIWyciwygChannel.idl => netwerk/protocol/wyciwyg/nsIWyciwygChannel.idl
rename : content/html/document/src/nsWyciwygChannel.cpp => netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp
rename : content/html/document/src/nsWyciwygChannel.h => netwerk/protocol/wyciwyg/nsWyciwygChannel.h
rename : content/html/document/src/nsWyciwygProtocolHandler.cpp => netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.cpp
rename : content/html/document/src/nsWyciwygProtocolHandler.h => netwerk/protocol/wyciwyg/nsWyciwygProtocolHandler.h
2010-10-11 13:35:10 +02:00
Timothy B. Terriberry
5e63566740 Bug 511348 - Integrate Tremor for Vorbis decoding for non/slow-FPU platforms. build changes. r=kyle a=blocking-fennec
--HG--
extra : rebase_source : 8a2b26f2150a440a2e289ddc94d9c3bfe6e23bbf
2010-10-18 19:56:01 -07:00
Kyle Huey
9a7fdfb2bf Bug 600540: Disable raw video by default. r=cpearce a=beltzer
--HG--
extra : rebase_source : 0ddea9a76805d6d8da3328c368c8393111ab7790
2010-10-06 16:17:54 -04:00
Oleg Romashin
497f2db326 Merge with mozilla central 2779c55431a4, no conflicts 2010-09-10 22:32:25 -07:00
Ben Turner
9d64943303 Bug 594583 - 'IndexedDB: Add some UI to clear IndexedDB databases'. r=sicking+gavin. a=beta6blocking. 2010-09-10 12:12:11 -07:00
Doug Turner
6ed1c44d56 Bug 573588 - Implement Desktop Notifications r=smaug, a=beltzner
--HG--
extra : rebase_source : 05ec761dd838e4f85a63df677c6335e456a8dfd6
2010-09-09 22:00:14 -07:00
Oleg Romashin
bd3aa71c63 Merged m-c: 51d17027ff45 -> cedar 2010-09-01 09:36:29 -07:00
Olli Pettay
37754ca52c Bug 585173 - Process message manager. r=dougt a=blocking-fennec 2010-08-31 11:58:35 -07:00
Chris Jones
49048c0d61 Merge m-c --> cedar
--HG--
rename : layout/style/test/test_hover.html => layout/style/test/hover_helper.html
2010-08-31 00:35:03 -05:00
Chris Jones
8992432666 Merge m-c --> cedar 2010-08-26 21:36:43 -05:00
David Zbarsky
4425a427fd Bug 36619 - allow file input .click() to bring up filepicker r=sicking a=blocking 2010-08-27 11:49:06 -04:00
Chris Jones
07e1a3fd87 Bug 570620, part n: Hook layout/ipc into the build system, and integrate PRenderFrame into the PBrowser family. sr=bsmedberg 2010-08-20 18:24:41 -05:00
Robert O'Callahan
8cbf8e9f2a Bug 585817. Part 3: Remove nsSVGUtils::GetThebesComputationalSurface and use gfxPlatform::ScreenReferenceSurface instead. r=jwatt 2010-08-20 14:29:01 -05:00
Jonas Sicking
5656569763 Bug 546857 Part 6: Disable XUL for pages, unless user specifically opts in for domain. r=jst a=blocker 2010-08-19 16:12:46 -07:00
Jonas Sicking
1efbd766ca Back out bug 546857 Part 6 due to talos failures. a=backout 2010-08-19 18:41:58 -07:00
Jonas Sicking
1a06bd84dd Bug 546857 Part 6: Disable XUL for pages, unless user specifically opts in for domain. r=jst a=blocker 2010-08-19 16:12:46 -07:00
Chris Jones
308355c7a0 Backed out changeset cebb111fbfc4 2010-08-19 19:03:56 -05:00
Robert O'Callahan
3ecd0a2a97 Bug 585817. Part 3: Remove nsSVGUtils::GetThebesComputationalSurface and use gfxPlatform::ScreenReferenceSurface instead. r=jwatt 2010-08-19 13:49:35 -05:00
Takanori MATSUURA
05b4001200 Bug 587614. Remove use of MOZ_NO_INSPECTOR_APIS. r=roc,a=NPOTB 2010-08-19 21:44:01 +12:00
Daniel Holbert
5d6d60ecb4 (no bug) a few whitespace fixes in layout, to triger fresh builds on a CLOSED TREE 2010-08-18 21:53:55 -07:00
Olli Pettay
a76dd6006c Bug 584866 - Cache LoadFrameScript Calls [r=jst] 2010-08-10 13:18:26 -04:00
Kyle Huey
8ba5a6053c Bug 581868: Remove nsIPrivateDOMImplementation. r=jst
--HG--
extra : rebase_source : 4e329c8b48034db725a1120094ec721d607dcb85
2010-07-29 12:23:13 -07:00
Kyle Huey
c83653fee9 Bug 508082: Implement a raw video decoder. Based on an earlier patch by Brad Lassey. r=doublec 2010-07-26 12:35:16 -07:00
Olli Pettay
abf43f852b Bug 566466 - speed up createElement(), r=jst, peterv 2010-07-23 12:49:57 +03:00
Robert O'Callahan
1cbc86420d Bug 564991. Part 25: Introduce a 'has active layers' flag on frames, which times out, and use it for 'opacity'. r=mats,sr=dbaron 2010-07-16 09:08:06 +12:00
Vladimir Vukicevic
ba073872bf b=578938; ANGLE compilation broken for non-libxul shared builds; r=khuey 2010-07-15 12:49:09 -07:00
Zack Weinberg
29e6f9c217 Bug 571989 part 5: move gfx/src/thebes/utils/* to gfx/thebes. r=joedrew
--HG--
rename : gfx/src/thebes/utils/gfxBlur.cpp => gfx/thebes/gfxBlur.cpp
rename : gfx/src/thebes/utils/gfxBlur.h => gfx/thebes/gfxBlur.h
rename : gfx/src/thebes/utils/gfxThebesUtils.cpp => gfx/thebes/gfxThebesUtils.cpp
rename : gfx/src/thebes/utils/gfxThebesUtils.h => gfx/thebes/gfxThebesUtils.h
rename : gfx/src/thebes/utils/nsCoreAnimationSupport.h => gfx/thebes/nsCoreAnimationSupport.h
rename : gfx/src/thebes/utils/nsCoreAnimationSupport.mm => gfx/thebes/nsCoreAnimationSupport.mm
2010-07-13 14:54:21 -07:00
Saint Wesonga
e7a357dcaf Bug 562387 - Convert NS_NEWXPCOM/NS_DELETEXPCOM to new/delete. r=bsmedberg 2010-07-05 11:42:18 +02:00
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
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
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
Benjamin Smedberg
762def30bb Merge mozilla-central into the static-xpcom-registration branch. 2010-06-23 17:26:25 -04:00
Ben Turner
a283994c5f Bug 553413 - 'Implement Asynchronous parts of the Indexed Database API.' p=sdwilsh+bent, r=jst. 2010-06-23 12:46:08 -07:00
Benjamin Smedberg
bf2719edde Bug 568691 - Add components that were lost during the merge of layout/build/nsLayoutModule.cpp 2010-06-22 12:59:57 -04: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
Benjamin Smedberg
9045c05660 Bug 568691 part A - register static and binary components using data tables rather than programmatic nsIComponentRegistrar methods. This part contains the important needs-review bits of the change: part B contains the mechanical changes to each module in order to actually get a working build. Part C will contain changes necessary to register JS components from .manifest files 2010-06-10 14:11:11 -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
Olli Pettay
8f81d70abb Bug 566024 - Add a 'global' messageManager, r=jst 2010-06-10 12:26:19 +03: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
Ehsan Akhgari
de9068003e Bug 574869 - Mac build without libxul fails for me because the IOKit framework is missing; r=ted 2010-06-25 20:22:09 -04: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
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
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
Olli Pettay
58b4f71840 m-c to e10 merge 2010-05-24 17:45:59 +03:00
Chris Jones
9327ed8dcc Merged m-c 2010-05-13 18:04:53 -05:00
Doug Turner
74337a6b6a Bug 552822 - IPC remoting of geolocation prompt. r=olli/r=jdm 2010-05-13 10:44:51 -07:00
Ehsan Akhgari
a87b134220 Bug 560647 - add startup timeline instrumentation; r=vlad 2010-05-19 19:22:19 -04:00
Ehsan Akhgari
d051ffeaed Bug 534785 - Move the ownership of editor and selection controller from the text frame to the content node; r=roc,jst sr=roc
(transplanted from 2437636244f39bbdc7d20b062e2c978b9d85c239)

--HG--
rename : layout/reftests/forms/placeholder/placeholder-14.html => layout/reftests/forms/placeholder/placeholder-18.html
extra : transplant_source : %247cbD%F3%9B%BD%C7%D2%0B%06.%2C%97%8B%9D%85%C29
2010-04-21 16:17:41 -04:00
Peter Van der Beken
b8972e3bbb Fix for bug 560289 (Inline nsLayoutStatics::Addref/Release). r=bz. 2010-04-19 17:41:39 +02:00
Kyle Huey
60c5aa6fd2 Backed out changeset f54e6386c113
--HG--
extra : rebase_source : 367bf92e0875df1663e79bd6b968cddd677eeb1c
2010-06-19 13:19:25 -07: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
Robert O'Callahan
6a21a7add0 Bug 572287. Fix leak of mThebesComputationalSurface. r=jwatt 2010-06-18 21:21:13 +12: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
Chris Pearce
ab123bcba3 Bug 572001 - Fix configure option --disable-ogg. r=ted 2010-06-17 10:17:36 +12:00
Ehsan Akhgari
1d27c39d4a Bug 520189 - Fix copy and test for the HTML editor; f=bzbarsky,dbaron r=sayrer,peterv,bzbarsky sr=roc 2010-04-09 17:06:09 -04:00
Peter Van der Beken
3fcb7546e7 Fix for bug 560199 (Link XPConnect and caps into layout). r=jst.
--HG--
extra : rebase_source : 5141822e9d560019ffc1e0cb0264782aa8aa7a99
2010-04-11 15:55:24 +02:00
Craig Topper
cb8187eff9 Remove nsICSSStyleSheet and replace all uses with nsCSSStyleSheet. (Bug 239008) r=dbaron 2010-05-11 13:41:47 -07:00
Dan Witte
1ac90420f6 Bug 564048 - Nix security checks in nsPrefBranch. r=sicking, sr=jst 2010-06-08 16:43:54 -07:00
Chris Pearce
2a11a80ccb Bug 566247 - WebM build system changes. r=ted 2010-06-09 11:31:27 +12:00