Ed Morley
abc3c40af5
Merge last green changeset of mozilla-inbound to mozilla-central
2011-10-14 10:58:43 +01:00
Jeff Hammel
d29697b551
Bug 676078 Remove unused mozmill code from mozilla-central r=ctalbert
...
--HG--
rename : testing/mozmill/simplejson-2.1.1/CHANGES.txt => other-licenses/simplejson-2.1.1/CHANGES.txt
rename : testing/mozmill/simplejson-2.1.1/LICENSE.txt => other-licenses/simplejson-2.1.1/LICENSE.txt
rename : testing/mozmill/simplejson-2.1.1/PKG-INFO => other-licenses/simplejson-2.1.1/PKG-INFO
rename : testing/mozmill/simplejson-2.1.1/conf.py => other-licenses/simplejson-2.1.1/conf.py
rename : testing/mozmill/simplejson-2.1.1/docs/_sources/index.txt => other-licenses/simplejson-2.1.1/docs/_sources/index.txt
rename : testing/mozmill/simplejson-2.1.1/docs/_static/contents.png => other-licenses/simplejson-2.1.1/docs/_static/contents.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/default.css => other-licenses/simplejson-2.1.1/docs/_static/default.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/doctools.js => other-licenses/simplejson-2.1.1/docs/_static/doctools.js
rename : testing/mozmill/simplejson-2.1.1/docs/_static/file.png => other-licenses/simplejson-2.1.1/docs/_static/file.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/interface.js => other-licenses/simplejson-2.1.1/docs/_static/interface.js
rename : testing/mozmill/simplejson-2.1.1/docs/_static/jquery.js => other-licenses/simplejson-2.1.1/docs/_static/jquery.js
rename : testing/mozmill/simplejson-2.1.1/docs/_static/minus.png => other-licenses/simplejson-2.1.1/docs/_static/minus.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/navigation.png => other-licenses/simplejson-2.1.1/docs/_static/navigation.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/plus.png => other-licenses/simplejson-2.1.1/docs/_static/plus.png
rename : testing/mozmill/simplejson-2.1.1/docs/_static/pygments.css => other-licenses/simplejson-2.1.1/docs/_static/pygments.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/rightsidebar.css => other-licenses/simplejson-2.1.1/docs/_static/rightsidebar.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/searchtools.js => other-licenses/simplejson-2.1.1/docs/_static/searchtools.js
rename : testing/mozmill/simplejson-2.1.1/docs/_static/sphinxdoc.css => other-licenses/simplejson-2.1.1/docs/_static/sphinxdoc.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/stickysidebar.css => other-licenses/simplejson-2.1.1/docs/_static/stickysidebar.css
rename : testing/mozmill/simplejson-2.1.1/docs/_static/traditional.css => other-licenses/simplejson-2.1.1/docs/_static/traditional.css
rename : testing/mozmill/simplejson-2.1.1/docs/genindex.html => other-licenses/simplejson-2.1.1/docs/genindex.html
rename : testing/mozmill/simplejson-2.1.1/docs/index.html => other-licenses/simplejson-2.1.1/docs/index.html
rename : testing/mozmill/simplejson-2.1.1/docs/objects.inv => other-licenses/simplejson-2.1.1/docs/objects.inv
rename : testing/mozmill/simplejson-2.1.1/docs/search.html => other-licenses/simplejson-2.1.1/docs/search.html
rename : testing/mozmill/simplejson-2.1.1/docs/searchindex.js => other-licenses/simplejson-2.1.1/docs/searchindex.js
rename : testing/mozmill/simplejson-2.1.1/docs/searchindex.json => other-licenses/simplejson-2.1.1/docs/searchindex.json
rename : testing/mozmill/simplejson-2.1.1/ez_setup.py => other-licenses/simplejson-2.1.1/ez_setup.py
rename : testing/mozmill/simplejson-2.1.1/index.rst => other-licenses/simplejson-2.1.1/index.rst
rename : testing/mozmill/simplejson-2.1.1/scripts/make_docs.py => other-licenses/simplejson-2.1.1/scripts/make_docs.py
rename : testing/mozmill/simplejson-2.1.1/setup.cfg => other-licenses/simplejson-2.1.1/setup.cfg
rename : testing/mozmill/simplejson-2.1.1/setup.py => other-licenses/simplejson-2.1.1/setup.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/__init__.py => other-licenses/simplejson-2.1.1/simplejson/__init__.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/_speedups.c => other-licenses/simplejson-2.1.1/simplejson/_speedups.c
rename : testing/mozmill/simplejson-2.1.1/simplejson/decoder.py => other-licenses/simplejson-2.1.1/simplejson/decoder.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/encoder.py => other-licenses/simplejson-2.1.1/simplejson/encoder.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/ordered_dict.py => other-licenses/simplejson-2.1.1/simplejson/ordered_dict.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/scanner.py => other-licenses/simplejson-2.1.1/simplejson/scanner.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/__init__.py => other-licenses/simplejson-2.1.1/simplejson/tests/__init__.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_check_circular.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_check_circular.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_decimal.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_decimal.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_decode.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_decode.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_default.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_default.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_dump.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_dump.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_encode_basestring_ascii.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_encode_basestring_ascii.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_encode_for_html.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_encode_for_html.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_fail.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_fail.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_float.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_float.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_indent.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_indent.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_pass1.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_pass1.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_pass2.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_pass2.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_pass3.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_pass3.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_recursion.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_recursion.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_scanstring.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_scanstring.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_separators.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_separators.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_speedups.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_speedups.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tests/test_unicode.py => other-licenses/simplejson-2.1.1/simplejson/tests/test_unicode.py
rename : testing/mozmill/simplejson-2.1.1/simplejson/tool.py => other-licenses/simplejson-2.1.1/simplejson/tool.py
rename : testing/mozmill/virtualenv/MANIFEST.in => other-licenses/virtualenv/MANIFEST.in
rename : testing/mozmill/virtualenv/PKG-INFO => other-licenses/virtualenv/PKG-INFO
rename : testing/mozmill/virtualenv/docs/_build/_sources/index.txt => other-licenses/virtualenv/docs/_build/_sources/index.txt
rename : testing/mozmill/virtualenv/docs/_build/_sources/license.txt => other-licenses/virtualenv/docs/_build/_sources/license.txt
rename : testing/mozmill/virtualenv/docs/_build/_sources/news.txt => other-licenses/virtualenv/docs/_build/_sources/news.txt
rename : testing/mozmill/virtualenv/docs/index.txt => other-licenses/virtualenv/docs/index.txt
rename : testing/mozmill/virtualenv/docs/license.txt => other-licenses/virtualenv/docs/license.txt
rename : testing/mozmill/virtualenv/docs/news.txt => other-licenses/virtualenv/docs/news.txt
rename : testing/mozmill/virtualenv/scripts/virtualenv => other-licenses/virtualenv/scripts/virtualenv
rename : testing/mozmill/virtualenv/setup.cfg => other-licenses/virtualenv/setup.cfg
rename : testing/mozmill/virtualenv/setup.py => other-licenses/virtualenv/setup.py
rename : testing/mozmill/virtualenv/virtualenv.py => other-licenses/virtualenv/virtualenv.py
rename : testing/mozmill/virtualenv/virtualenv_support/__init__.py => other-licenses/virtualenv/virtualenv_support/__init__.py
rename : testing/mozmill/virtualenv/virtualenv_support/distribute-0.6.8.tar.gz => other-licenses/virtualenv/virtualenv_support/distribute-0.6.8.tar.gz
rename : testing/mozmill/virtualenv/virtualenv_support/pip-0.7.1.tar.gz => other-licenses/virtualenv/virtualenv_support/pip-0.7.1.tar.gz
rename : testing/mozmill/virtualenv/virtualenv_support/setuptools-0.6c11-py2.4.egg => other-licenses/virtualenv/virtualenv_support/setuptools-0.6c11-py2.4.egg
rename : testing/mozmill/virtualenv/virtualenv_support/setuptools-0.6c11-py2.5.egg => other-licenses/virtualenv/virtualenv_support/setuptools-0.6c11-py2.5.egg
rename : testing/mozmill/virtualenv/virtualenv_support/setuptools-0.6c11-py2.6.egg => other-licenses/virtualenv/virtualenv_support/setuptools-0.6c11-py2.6.egg
2011-10-13 16:27:33 -07:00
Brad Lassey
3b89b06f44
Backed out changeset c3a50afc2243 due to large volume of crashes tracked in bug 687367
2011-10-10 10:40:27 -04:00
Matt Brubeck
605f836e6c
Back out f7bf7ac18a79 (bug 684826), 3a910924c50c (bug 687367), and 524a6bb8744b (bug 693086) because of Android bustage on a CLOSED TREE
2011-10-10 09:47:27 -07:00
Brad Lassey
60a64b5e80
merge
2011-10-10 10:40:57 -04:00
Brad Lassey
bf25d94f50
Backed out changeset c3a50afc2243 due to large volume of crashes tracked in bug 687367
2011-10-10 10:40:27 -04:00
Michael Edwards
cd0c00f8f2
Bug 687367 - Make bionic domain name functions thread-safe on pre-3.0 Android, r=dougt
2011-10-06 20:55:50 -07:00
Matt Brubeck
7e0963eed8
Bug 691054 - Back out bug 667980 (getNetworkLinkType) on Android because of scary permissions [r=dougt]
2011-10-03 16:34:43 -07:00
Mike Hommey
9783ee4a43
Bug 690856 - Ensure Instruction and Data cache coherency after extracting libraries from the DEBUG intent r=mwu
2011-09-30 20:42:24 +02:00
Matt Brubeck
7b9b87d629
Merge last green changeset of mozilla-inbound to mozilla-central
2011-10-07 12:06:20 -07:00
Mike Hommey
367d83793c
Bug 687446 - Allow debug symbols to be found under gdb without extracted libraries. r=mwu
2011-10-07 08:31:29 +02:00
Mike Hommey
0f6fcdb7e9
Bug 692381 - Remove one of the Android library extraction code paths. r=mwu
2011-10-07 08:30:32 +02:00
Makoto Kato
89bf0597c8
Bug 681202 - Add Android x86 target. r=glandium
2011-09-29 13:39:03 +09:00
Fabrice Desré
2b1103493c
Bug 659188 - Android and media parts [r=blassey] [r=cpearce]
2011-09-26 17:25:41 -07:00
Mike Hommey
20df4a9374
Bug 687147 - Ensure Instruction and Data cache coherency after extracting libraries. r=mwu
2011-09-23 14:31:11 +02:00
Mike Hommey
10d9b1f0d9
Bug 686876 - Move libraries at the top level in the apk. r=mfinkle
2011-09-21 18:06:14 +02:00
Jim Chen
62b8c6e951
Bug 687147 - Workaround linker crash when calling .init_array in libmozalloc.so; r=
...
Bug 687147 - Workaround linker crash when calling .init_array in libmozalloc.so; r=mfinkle r=glandium
2011-09-20 11:16:00 -04:00
Doug Turner
c938f47ba6
Bug 630007 - Minimal support NPAPI on ANDROID. Pre-Honeycomb inproccess support only. r=josh.
2011-09-16 14:34:31 -07:00
Ed Morley
9c6e88d2d6
Backout d4bdab069bbc (bug 630007) for qt build bustage and various oranges on other platforms
2011-09-17 00:27:55 +01:00
Doug Turner
d6d932e4e7
Bug 630007 - Minimal support NPAPI on ANDROID. Pre-Honeycomb inproccess support only. r=josh.
2011-09-16 14:34:31 -07:00
Kyle Huey
a0800c6141
Merge m-c to b-s.
2011-09-07 10:47:50 -04:00
Mike Hommey
892d941413
Bug 684213 - Directly uncompress libraries into the mmap()ed cache files. r=mwu
2011-09-07 07:56:28 +02:00
Mike Hommey
402b882927
Backout the backout of e5815c156b6c (bug 683096), 9ca928d8095c (merge), a286edb8ca4b (bug 683875), 61dc35b8f63f (bug 683171), b0741ae44def (bug 683875), 8e01bc314326 + e2697c06468f (bug 677501), 805e28e85577 (bug 680440)
2011-09-03 08:19:06 +02:00
Ed Morley
ee10afb48a
Backout e5815c156b6c (bug 683096), 9ca928d8095c (merge), a286edb8ca4b (bug 683875), 61dc35b8f63f (bug 683171), b0741ae44def (bug 683875), 8e01bc314326 + e2697c06468f (bug 677501), 805e28e85577 (bug 680440) for Win opt orange and purple galore, on a CLOSED TREE
2011-09-03 04:35:21 +01:00
Kyle Huey
5aba5a29af
Merge b-s to m-c.
2011-09-02 17:35:11 -04:00
Mike Hommey
8285bb9468
Bug 677501 - Build a mozutils library containing jemalloc and other things. r=khuey
...
--HG--
rename : memory/jemalloc/Makefile.in => memory/mozutils/Makefile.in
rename : memory/jemalloc/fixcrt.py => memory/mozutils/fixcrt.py
rename : memory/jemalloc/jemalloc.def => memory/mozutils/mozutils.def.in
2011-09-01 14:12:10 +02:00
Mike Hommey
4f09641fb4
Bug 680440 - Clean up jemalloc linkage. r=khuey
2011-09-01 14:11:56 +02:00
Kyle Huey
134b8fad07
Merge m-c to b-s.
2011-08-31 07:52:43 -04:00
Jim Chen
031e5ad085
Bug 674806 - d. Use char* for pointer arithmetic [r=mwu]
2011-08-30 17:11:37 -07:00
Ed Morley
c62c25def9
Merge last green changeset on m-i to m-c
2011-09-01 08:41:18 +01:00
Atul Aggarwal
6c8e5db9c1
Bug 679612 - Add fclose calls to every exit point in APKOpen.cpp to prevent resource leaks; r=mwu
2011-08-31 16:30:33 +01:00
Kyle Huey
4a1055ab6c
Merge m-c to b-s.
2011-08-24 08:34:27 -04:00
Mike Hommey
7f22909cc5
Bug 680373 - Link jemalloc into mozutils instead of mozalloc on Android. r=blassey,r=pbiggar
2011-08-24 12:55:13 +02:00
Mike Hommey
49b43ec341
Bug 681203 - Bind all symbols when dynamic symbol lookup is not supported. r=mwu
2011-08-23 16:12:44 +02:00
Doug Turner
5fa554f56b
Bug 661978 - Android file input activity deadlocks. r=blassey
2011-08-18 19:30:22 -07:00
Mike Hommey
05fea6caff
Bug 651889 - Add support for dynamic symbol lookup in the Android dynamic linker. r=mwu
2011-08-09 13:35:52 +02:00
Mike Hommey
ad6774938a
Bug 681588 - Cleanup wrap malloc and its use on Android. r=ted
2011-08-29 19:21:22 +02:00
Doug Turner
7dbf23a135
Bug 667980: Expose network connection type to chrome. r=dougt
...
Add an attribute to nsINetworkLinkService that represents the connection type,
and add code to the android back-end to expose the connection type and notify
when it changes.
2011-07-10 15:24:05 -07:00
Doug Turner
d75610af9e
Bug 670201 - Remove most #ifdef DEBUG from custom loader. r=mwu
2011-07-09 19:50:22 -07:00
Mike Hommey
ff080071d2
Bug 647288 - Make our Android linker properly load libraries outside the .apk. r=mwu
2011-07-07 16:34:33 +02:00
Mike Hommey
9c0ad6e9b2
Bug 664934 - Add user and system usage in GeckoLibLoad log. r=mwu
2011-06-17 08:59:39 +02:00
Brad Lassey
f9a2da5283
bug 660326 - send java exceptions to crash-stats r=dougt
2011-06-01 13:54:53 -04:00
Vladimir Vukicevic
234cfda8ff
Content processes should not crash on startup when building with --disable-crashreporter, r=mwu
2011-05-25 16:54:30 -04:00
Mike Hommey
7de58a1cfa
Bug 620931 part 3 - Allow GRE and XUL application to use omni.jar independently. r=bsmedberg,r=mwu
...
We now store two independent locations for an omni.jar, allowing GRE/XRE and
XUL application to each have their own omni.jar. And since xulrunner setups
are very independent from the XUL applications, we implement support for both
omni.jar and non omni.jar cases in the same runtime, with the side effect of
allowing to switch from one to the other manually without rebuilding the
binaries.
We let the mozilla::Omnijar API handle both cases, so that callers don't need
too much work to support them.
We also make the preferences service load the same set of preferences in all
the various cases (unified vs. separate, omni.jar vs. no omni.jar).
The child process launcher for IPC is modified to pass the base directories
needed for the mozilla::Omnijar API initialization in the child process.
Finally, the startupcache file name canonicalization is modified to separate
APP and GRE resources.
2011-02-25 12:53:36 +01:00
Ed Morley
774351215f
Bug 654716 - Remove WinCE code from other-licenses/bsdiff/Makefile.in; r=ted
2011-05-09 09:54:40 -07:00
Brad Taylor
0bb6a3a301
Bug 480317 - Provide a way for atk-based plugins to slot into our a11y tree, r=joshmoz, ginn, surkov, trev, patch=btaylor, mcarrion, mgorse
2011-04-27 22:42:18 +09:00
Mike Hommey
fe3ae3c16a
Bug 561032 - Move Firefox branding into browser/branding/official. r=gavin,r=pike
...
--HG--
rename : other-licenses/branding/firefox/LICENSE => browser/branding/official/LICENSE
rename : other-licenses/branding/firefox/Makefile.in => browser/branding/official/Makefile.in
rename : other-licenses/branding/firefox/background.png => browser/branding/official/background.png
rename : other-licenses/branding/firefox/branding.nsi => browser/branding/official/branding.nsi
rename : other-licenses/branding/firefox/configure.sh => browser/branding/official/configure.sh
rename : other-licenses/branding/firefox/content/Makefile.in => browser/branding/official/content/Makefile.in
rename : other-licenses/branding/firefox/content/about-logo.png => browser/branding/official/content/about-logo.png
rename : other-licenses/branding/firefox/content/about-wordmark.png => browser/branding/official/content/about-wordmark.png
rename : other-licenses/branding/firefox/content/about.png => browser/branding/official/content/about.png
rename : other-licenses/branding/firefox/content/icon48.png => browser/branding/official/content/icon48.png
rename : other-licenses/branding/firefox/content/icon64.png => browser/branding/official/content/icon64.png
rename : other-licenses/branding/firefox/content/jar.mn => browser/branding/official/content/jar.mn
rename : other-licenses/branding/firefox/default16.png => browser/branding/official/default16.png
rename : other-licenses/branding/firefox/default22.png => browser/branding/official/default22.png
rename : other-licenses/branding/firefox/default24.png => browser/branding/official/default24.png
rename : other-licenses/branding/firefox/default256.png => browser/branding/official/default256.png
rename : other-licenses/branding/firefox/default32.png => browser/branding/official/default32.png
rename : other-licenses/branding/firefox/default48.png => browser/branding/official/default48.png
rename : other-licenses/branding/firefox/disk.icns => browser/branding/official/disk.icns
rename : other-licenses/branding/firefox/document-os2.ico => browser/branding/official/document-os2.ico
rename : other-licenses/branding/firefox/document.icns => browser/branding/official/document.icns
rename : other-licenses/branding/firefox/document.ico => browser/branding/official/document.ico
rename : other-licenses/branding/firefox/document.png => browser/branding/official/document.png
rename : other-licenses/branding/firefox/dsstore => browser/branding/official/dsstore
rename : other-licenses/branding/firefox/firefox-os2.ico => browser/branding/official/firefox-os2.ico
rename : other-licenses/branding/firefox/firefox.icns => browser/branding/official/firefox.icns
rename : other-licenses/branding/firefox/firefox.ico => browser/branding/official/firefox.ico
rename : other-licenses/branding/firefox/locales/Makefile.in => browser/branding/official/locales/Makefile.in
rename : other-licenses/branding/firefox/locales/browserconfig.properties => browser/branding/official/locales/browserconfig.properties
rename : other-licenses/branding/firefox/locales/en-US/brand.dtd => browser/branding/official/locales/en-US/brand.dtd
rename : other-licenses/branding/firefox/locales/en-US/brand.properties => browser/branding/official/locales/en-US/brand.properties
rename : other-licenses/branding/firefox/locales/jar.mn => browser/branding/official/locales/jar.mn
rename : other-licenses/branding/firefox/mozicon128.png => browser/branding/official/mozicon128.png
rename : other-licenses/branding/firefox/pref/firefox-branding.js => browser/branding/official/pref/firefox-branding.js
rename : other-licenses/branding/firefox/splash.bmp => browser/branding/official/splash.bmp
rename : other-licenses/branding/firefox/wizHeader.bmp => browser/branding/official/wizHeader.bmp
rename : other-licenses/branding/firefox/wizHeaderRTL.bmp => browser/branding/official/wizHeaderRTL.bmp
rename : other-licenses/branding/firefox/wizWatermark.bmp => browser/branding/official/wizWatermark.bmp
2011-04-13 09:58:13 +02:00
Mike Hommey
d8ec2275fb
Bug 644692 - Fix bsdiff build failure with system bzip2. r=ted
2011-04-13 09:44:23 +02:00
Jory A. Pratt
6cc6e8feba
Bug 581812 - yacc.py should use hashlib instead of md5 which has been depreciated; r=bsmedberg
2010-08-16 09:39:00 -04:00
Tim Taubert
cc1c88b8ef
Bug 644794 - Remove "browser.panorama.welcome_url" legacy preferences; r=dao
2011-03-24 17:04:00 -04:00
