Commit Graph

34 Commits

Author SHA1 Message Date
Mike Hommey
11e51cf582 Bug 1072152 - Change chrome.manifest read order. r=bsmedberg
In case of multiple "resource" manifest entries for the same keyword, the
last registered one now takes precedence, like any other chrome manifest
entry.
2014-09-25 14:47:03 +09:00
Jim Blandy
7e20285e70 Bug 914753: Make Emacs file variable header lines correct, or at least consistent. DONTBUILD r=ehsan
The -*- file variable lines -*- establish per-file settings that Emacs will
pick up. This patch makes the following changes to those lines (and touches
nothing else):

 - Never set the buffer's mode.

   Years ago, Emacs did not have a good JavaScript mode, so it made sense
   to use Java or C++ mode in .js files. However, Emacs has had js-mode for
   years now; it's perfectly serviceable, and is available and enabled by
   default in all major Emacs packagings.

   Selecting a mode in the -*- file variable line -*- is almost always the
   wrong thing to do anyway. It overrides Emacs's default choice, which is
   (now) reasonable; and even worse, it overrides settings the user might
   have made in their '.emacs' file for that file extension. It's only
   useful when there's something specific about that particular file that
   makes a particular mode appropriate.

 - Correctly propagate settings that establish the correct indentation
   level for this file: c-basic-offset and js2-basic-offset should be
   js-indent-level. Whatever value they're given should be preserved;
   different parts of our tree use different indentation styles.

 - We don't use tabs in Mozilla JS code. Always set indent-tabs-mode: nil.
   Remove tab-width: settings, at least in files that don't contain tab
   characters.

 - Remove js2-mode settings that belong in the user's .emacs file, like
   js2-skip-preprocessor-directives.
2014-06-24 22:12:07 -07:00
Gregory Szorc
7bd3c0ae36 Bug 901990 - Part 2: Upgrade xpcshell manifests; r=ted
--HG--
rename : toolkit/mozapps/extensions/test/xpcshell-unpack/head_unpack.js => toolkit/mozapps/extensions/test/xpcshell/head_unpack.js
2013-09-24 11:50:08 -07:00
Axel Hecht
bdd6f9e657 bug 848297, allow overrides of locales for packages, r=bsmedberg
--HG--
extra : rebase_source : 12a32470bdf6c7afd0c2e1ac50e3051773e3ad47
2013-04-26 17:11:47 +02:00
Irving Reid
c9d4d1ac3f Bug 557024: Mock out the locale service to make test reliable on non en-US systems. r=bsmedberg 2012-02-14 21:33:43 -05:00
Gervase Markham
82ff7027aa Bug 716478 - update licence to MPL 2. 2012-05-21 12:12:37 +01:00
Hernan Rodriguez Colmeiro
c4c4295119 Bug 564667: Allow bootstrapped add-ons to have chrome URLs. r=dtownsend, sr=bsmedberg 2011-07-29 11:20:47 +02:00
Joel Maher
193c66083d Bug 616999. Xpcshell manifest support; manifest files. r=ted, a=test-only 2011-05-20 11:54:01 -04:00
Vivien Nicolas
5a57d40dc8 Bug 597296 - Chrome registry selected locale should not changed immediatly [r=bsmedberg,glandium, a=blocking-fennec] 2010-11-30 15:02:23 +01:00
Ehsan Akhgari
c149fb3212 Followup of the backout of bug 542999, fix an incorrect merge conflict resolution 2010-11-29 22:27:46 -05:00
Ehsan Akhgari
df34270157 Merge backout of bug 542999 2010-11-29 20:50:32 -05:00
Ehsan Akhgari
93f671b05d Backed out changeset 78d7e307a632 (bug 542999) because the patch doesn't solve the problem, and the test is broken 2010-11-29 20:40:42 -05:00
Mike Hommey
42a23d1a48 Bug 542999 - Setting general.useragent.locale in user profile should override any intl.locale.matchOS setting. r=bsmedberg 2010-02-22 12:42:38 +13:00
Vivien Nicolas
23835525bd Bug 519468: matchOS is read from default prefs at startup [r=benjamin] 2009-11-02 13:04:45 -05:00
Ted Mielczarek
1771ccc676 bug 482085 - fix all xpcshell tests to not reference files from the srcdir. r=bsmedberg,waldo
--HG--
rename : toolkit/components/downloads/test/downloads.empty.sqlite => browser/components/privatebrowsing/test/unit/downloads.empty.sqlite
rename : dom/src/json/test/fail1.json => dom/src/json/test/unit/fail1.json
rename : dom/src/json/test/fail10.json => dom/src/json/test/unit/fail10.json
rename : dom/src/json/test/fail11.json => dom/src/json/test/unit/fail11.json
rename : dom/src/json/test/fail12.json => dom/src/json/test/unit/fail12.json
rename : dom/src/json/test/fail13.json => dom/src/json/test/unit/fail13.json
rename : dom/src/json/test/fail14.json => dom/src/json/test/unit/fail14.json
rename : dom/src/json/test/fail15.json => dom/src/json/test/unit/fail15.json
rename : dom/src/json/test/fail16.json => dom/src/json/test/unit/fail16.json
rename : dom/src/json/test/fail17.json => dom/src/json/test/unit/fail17.json
rename : dom/src/json/test/fail18.json => dom/src/json/test/unit/fail18.json
rename : dom/src/json/test/fail19.json => dom/src/json/test/unit/fail19.json
rename : dom/src/json/test/fail2.json => dom/src/json/test/unit/fail2.json
rename : dom/src/json/test/fail20.json => dom/src/json/test/unit/fail20.json
rename : dom/src/json/test/fail21.json => dom/src/json/test/unit/fail21.json
rename : dom/src/json/test/fail22.json => dom/src/json/test/unit/fail22.json
rename : dom/src/json/test/fail23.json => dom/src/json/test/unit/fail23.json
rename : dom/src/json/test/fail24.json => dom/src/json/test/unit/fail24.json
rename : dom/src/json/test/fail25.json => dom/src/json/test/unit/fail25.json
rename : dom/src/json/test/fail26.json => dom/src/json/test/unit/fail26.json
rename : dom/src/json/test/fail27.json => dom/src/json/test/unit/fail27.json
rename : dom/src/json/test/fail28.json => dom/src/json/test/unit/fail28.json
rename : dom/src/json/test/fail29.json => dom/src/json/test/unit/fail29.json
rename : dom/src/json/test/fail3.json => dom/src/json/test/unit/fail3.json
rename : dom/src/json/test/fail30.json => dom/src/json/test/unit/fail30.json
rename : dom/src/json/test/fail31.json => dom/src/json/test/unit/fail31.json
rename : dom/src/json/test/fail32.json => dom/src/json/test/unit/fail32.json
rename : dom/src/json/test/fail33.json => dom/src/json/test/unit/fail33.json
rename : dom/src/json/test/fail34.json => dom/src/json/test/unit/fail34.json
rename : dom/src/json/test/fail4.json => dom/src/json/test/unit/fail4.json
rename : dom/src/json/test/fail5.json => dom/src/json/test/unit/fail5.json
rename : dom/src/json/test/fail6.json => dom/src/json/test/unit/fail6.json
rename : dom/src/json/test/fail7.json => dom/src/json/test/unit/fail7.json
rename : dom/src/json/test/fail8.json => dom/src/json/test/unit/fail8.json
rename : dom/src/json/test/fail9.json => dom/src/json/test/unit/fail9.json
rename : dom/src/json/test/json2.js => dom/src/json/test/unit/json2.js
rename : dom/src/json/test/pass1.json => dom/src/json/test/unit/pass1.json
rename : dom/src/json/test/pass3.json => dom/src/json/test/unit/pass3.json
rename : testing/xpcshell/example/location_load.js => testing/xpcshell/example/unit/location_load.js
rename : toolkit/components/commandlines/test/unit/unix/test_bug410156.js => toolkit/components/commandlines/test/unit_unix/test_bug410156.js
rename : toolkit/components/commandlines/test/unit/win/test_bug410156.js => toolkit/components/commandlines/test/unit_win/test_bug410156.js
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug257155/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug257155/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_a_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_a_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_a_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_a_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_b_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_b_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_b_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_b_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_c_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_c_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_c_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_c_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_d_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_d_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_d_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_d_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_e_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_e_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_e_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_e_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_f_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_f_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_f_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_f_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_g_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_g_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug299716_g_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug299716_g_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug324121_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug324121_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug324121_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug324121_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug324121_3/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug324121_3/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug324121_4/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug324121_4/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug324121_5/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug324121_5/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug324121_6/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug324121_6/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug324121_7/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug324121_7/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug324121_8/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug324121_8/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug324121_9/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug324121_9/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug335238_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug335238_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug335238_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug335238_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug378216_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug378216_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug378216_10/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug378216_10/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug378216_11/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug378216_11/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug378216_12/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug378216_12/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug378216_13/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug378216_13/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug378216_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug378216_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug378216_3/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug378216_3/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug378216_4/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug378216_4/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug378216_5/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug378216_5/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug378216_6/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug378216_6/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug378216_7/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug378216_7/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug378216_8/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug378216_8/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug378216_9/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug378216_9/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug394300_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug394300_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug394300_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug394300_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug396129_a_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug396129_a_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug396129_a_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug396129_a_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug396129_b_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug396129_b_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug396129_b_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug396129_b_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug396129_c_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug396129_c_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug396129_c_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug396129_c_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug396129_d_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug396129_d_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug396129_d_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug396129_d_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug397778/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug397778/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug425657/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug425657/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug428341_1/README => toolkit/mozapps/extensions/test/addons/test_bug428341_1/README
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug428341_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug428341_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug428341_3/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug428341_3/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug428341_4/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug428341_4/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug428341_5/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug428341_5/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug428341_6/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug428341_6/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug428341_7/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug428341_7/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug428341_8/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug428341_8/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug428341_9/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug428341_9/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug436207/install.js => toolkit/mozapps/extensions/test/addons/test_bug436207/install.js
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug463819_1/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug463819_1/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug463819_2/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug463819_2/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug463819_3/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug463819_3/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug463819_4/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug463819_4/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug463819_5/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug463819_5/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug463819_6/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug463819_6/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug463819_7/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug463819_7/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug463819_8/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug463819_8/install.rdf
rename : toolkit/mozapps/extensions/test/unit/addons/test_bug463819_9/install.rdf => toolkit/mozapps/extensions/test/addons/test_bug463819_9/install.rdf
2009-03-21 11:20:00 -04:00
Shawn Wilsher
fe66178c10 Bug 466582 - smarter handling of remote chrome (and not allowing it)
This adds a new flag, URI_IS_LOCAL_RESOURCE, to nsIProtocolHandler that allows
something of this protocol to be registered in chrome.

This changeset removes a runtime check every time we open a chrome channel to
see if it is remote to a registration time check that checks flags.  The old
code could be easily worked around, and allowed for remote resources to be used.

r=bsmedberg
r=bz
sr=bz
2008-12-09 16:27:42 -05:00
Shawn Wilsher
205d129c10 Backed out changeset b6f762fde736 (bug 466582) for unit test orange. 2008-12-08 18:51:46 -05:00
Shawn Wilsher
2a28a8b2b1 Bug 466582 - smarter handling of remote chrome (and not allowing it)
r=bsmedberg, r=bz, sr=bz
2008-12-08 17:14:14 -05:00
Justin Dolske
d244c9fd91 bug 580508 - fix test_resolve_uris.js test. r=mossop 2010-08-03 16:26:27 +12:00
Mark Banner
ed19cc056e Make test_resolve_uris.js account for non-libxul configurations where app-info isn't available and isn't needed. Agreed over irc with jdm. Test-only bustage fix. 2010-07-05 19:46:31 +01:00
Benjamin Smedberg
a677e5bf91 Merge mozilla-central, including the Electrolysis changes, into the branch for bug 568691. 2010-07-01 11:55:57 -04:00
Benjamin Smedberg
31d43bc591 Support Windows line endings in manifest files again (regression introduced in revision 5229353383b0). With test! 2010-06-29 13:16:43 -04:00
Benjamin Smedberg
c4d4769b01 Bug 568691 - Add an ABI chrome registration modifier so that platform-specific directories can be implemented directly in chrome.manifest. 2010-06-27 15:13:04 -04:00
Benjamin Smedberg
be066df421 Fix chrome registry test setup. 2010-06-25 20:53:20 -04:00
Oleg Romashin
8cafa44858 Merged with mozilla-central 2010-04-07 06:59:04 -04:00
Josh Matthews
767ff3bc23 Bug 542907 - "e10s: Chrome registry should be unified between parent and child" [r=benjamin] 2010-03-11 18:33:00 +13:00
Serge Gautherie
b113991cf7 Bug 541671 - [SeaMonkey 2.1] xpcshell: test_bug519468.js fails; (Av1) Call checkForNewChrome(), s/TmpD/ProfD/.
r=benjamin.
2010-04-02 18:25:13 +02:00
benjamin@smedbergs.us
c88b3a5c89 Bug 292789 (the chrome registry part), add a contentaccessible flag for packages and expose it on nsIXULChromeRegistry, r=dtownsend sr=jst a=beltzner 2008-04-11 06:39:43 -07:00
reed@reedloden.com
54a532b0fc Bug 415367 - "ieTab extension not working due to use of ":" in chrome URIs" (adding test only) [p=ehsan.akhgari@gmail.com (Ehsan Akhgari [ehsan]) r+sr=dveditz] 2008-02-16 19:29:20 -08:00
dtownsend@oxymoronical.com
e4f9d7cf9a Bug 401153: Provide resource:// substitutions for installed add-ons. r=bsmedberg, a=beltzner 2007-12-21 11:32:54 -08:00
reed@reedloden.com
1c2d0e1f21 Bug 403621 - "fix various ArrayEnumerator implementations" [p=dao@mozilla.com (Dão Gottwald) r=Mano a1.9=schrep] 2007-11-21 13:15:39 -08:00
reed@reedloden.com
942e331e2d Bug 397073 - "Allow runtime overrides by OS version for chrome" [p=Mossop r=bsmedberg a1.9=schrep] 2007-11-12 21:38:48 -08:00
reed@reedloden.com
f9ae7e965e Bug 399707 - "Add inverse matching for string flags" [p=Mossop r=bsmedberg a1.9=damons] 2007-11-12 21:32:09 -08:00
dtownsend@oxymoronical.com
d139348d49 Testcase for bug 380398: appversion manifest flag is broken in certain situations. r=bsmedberg 2007-05-30 14:52:47 -07:00