Commit graph

22 commits

Author SHA1 Message Date
Richard Peter
5fcf831fbd Merge branch 'master_13.4.1' (13.4.1-5) into omaha_13.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/FFMPMonitor.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPConfig.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanMonitor.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/ScanStarterJob.java
	cave/com.raytheon.uf.viz.monitor.scan/src/com/raytheon/uf/viz/monitor/scan/resource/ScanDrawer.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/climatology/CigVisByHourTabComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/griddata/AbstractGridData.java
	cave/com.raytheon.viz.ui.personalities.awips/src/com/raytheon/viz/ui/personalities/awips/AbstractCAVEComponent.java
	edexOsgi/build.edex/opt/db/ddl/maps/importShapeFile.sh
	edexOsgi/com.raytheon.edex.plugin.bufrmos/src/com/raytheon/edex/plugin/bufrmos/common/BufrMosData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/smartinit/IFPWE.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/gfeLevelMappingFile.xml
	edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-decode.xml
	edexOsgi/com.raytheon.edex.plugin.redbook/src/com/raytheon/edex/plugin/redbook/common/RedbookRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasin.java
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GFERecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.npp.sounding/src/com/raytheon/uf/common/dataplugin/npp/sounding/NPPSoundingRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/PluginDataObject.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/DefaultPathProvider.java
	edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/persist/PersistablePluginDataObject.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/DataTime.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/TimeRange.java
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/ifpnetcdf/ifpnetCDF.py
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/iscmosaic/iscMosaic.py
	edexOsgi/com.raytheon.uf.tools.gfesuite/cli/src/purgeallgrids/purgeAllGrids.py
	nativeLib/dist.native/i386-pc-linux-gnu.tar
	nativeLib/rary.ohd.filesystem/awips/hydroapps/set_hydro_env
	pythonPackages/qpid/bin/qpid-queue-count
	pythonPackages/qpid/bin/qpid-stat
	rpms/awips2.core/Installer.database-server-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.database-standalone-configuration/configuration/postgresql.conf
	rpms/awips2.core/Installer.ldm/component.spec
	rpms/awips2.core/Installer.ldm/patch/etc/ldmadmin-pl.conf
	rpms/awips2.core/Installer.ldm/src/awips2-ldm.6.11.2.tar.gz
	rpms/awips2.core/Installer.ncep-database/component.spec
	rpms/awips2.qpid/0.18/SOURCES/virtualhosts.xml
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/build/x86_64/build.sh
	tests/.classpath

Change-Id: Ie5c71a39060fdd21d17f1c73ec79c03dfe523cfb

Former-commit-id: d11666193f [formerly 17a5f519cc] [formerly 083700d315] [formerly d11666193f [formerly 17a5f519cc] [formerly 083700d315] [formerly 2b496de6d8 [formerly 083700d315 [formerly 9fb7a04d920e56496cdc896513da8fc54765c6d5]]]]
Former-commit-id: 2b496de6d8
Former-commit-id: e4f3d60d90 [formerly 398e808300] [formerly a57ab1971925eee09755783786207fd3536b9553 [formerly 349bcc15d7]]
Former-commit-id: c8a4f837912af5727cbf29ece9f4e5dfd427fc63 [formerly 7db060699c]
Former-commit-id: 0bf43c4a4d
2013-05-05 14:25:36 -05:00
Richard Peter
3c676e2c4b Issue #1814: Update Slow Consumer to have max depth of 100M
Change-Id: I53bd0260622d0fc79d16141b9d64ea2cb5b28310

Former-commit-id: f76d9b3365 [formerly 26ab9ac0d4] [formerly a3c86efdd1] [formerly f76d9b3365 [formerly 26ab9ac0d4] [formerly a3c86efdd1] [formerly 630eda8286 [formerly a3c86efdd1 [formerly fc038aa3edb9c017a926fc3124eb35966b55aa4f]]]]
Former-commit-id: 630eda8286
Former-commit-id: 9e6ee9fabb [formerly f7e5d72cec] [formerly f33bc71e69b91cdf85a94570aa8c37a17d6b8fa5 [formerly 917320fb4f]]
Former-commit-id: 71de1fb3134348e427e1519464b58b1f2d844fe6 [formerly 514c42b1b4]
Former-commit-id: d6e2fc90df
2013-05-03 09:25:48 -05:00
Steve Harris
ba48ab0362 13.4.1-4 baseline
Former-commit-id: ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly ef5893b279 [formerly 99f4569650] [formerly d33e5861aa] [formerly 7a78f8ac6e [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]]]
Former-commit-id: 7a78f8ac6e
Former-commit-id: 7d085660f8 [formerly 4357e2dacc] [formerly 0d136c3db2023f33ea2f1f9c8c67dab99b99d829 [formerly 7828293d32]]
Former-commit-id: 6fc143d13d42b0d419bcede3614f0ee982260764 [formerly e0986cfda8]
Former-commit-id: 5dbfeb38ac
2013-05-02 10:00:38 -05:00
Steve Harris
b0fb1f49be 13.4.1-1 baseline
Former-commit-id: 79567aac51 [formerly f95e0ad10b] [formerly 2f517b7713] [formerly 79567aac51 [formerly f95e0ad10b] [formerly 2f517b7713] [formerly 00332e6305 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]]]
Former-commit-id: 00332e6305
Former-commit-id: aecc3cfd89 [formerly 0e950655f1] [formerly fff69f92a60e6f16033e299ff1dd2395fac95290 [formerly 4accbb80db]]
Former-commit-id: 85465ead73fe31102e486ee012a5fcb51cfcc9b9 [formerly 4001e050e7]
Former-commit-id: 722e428c74
2013-04-24 17:15:55 -05:00
Bryan Kowal
d7436edaca Issue #1805 - adding missing qpid changeset to 13.4
- the baselined AWIPS II Jetty was incompatible with qpid; so, the expected version of jetty will be used
- source jars will no longer be included in the rpms
- merged specs patch file

Change-Id: I8172800bfbc31be7117c490e828ebfc1e2355774

Conflicts:

	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0


Former-commit-id: 2ec2c5abd5 [formerly 1f868d391f] [formerly d7b463f6a4] [formerly 2ec2c5abd5 [formerly 1f868d391f] [formerly d7b463f6a4] [formerly f3dfe43098 [formerly d7b463f6a4 [formerly 2d38533790815d569a957702f6f4b122de9bcd62]]]]
Former-commit-id: f3dfe43098
Former-commit-id: b5a50b9c2a [formerly 29d65b3161] [formerly d5652654570fb393d1a73c8839756c183fd8d9d4 [formerly fd40278c71]]
Former-commit-id: 8720fa34f046fedbea3fc299f64ed606b0fb8909 [formerly e413abcaf9]
Former-commit-id: 7f1ebb5973
2013-04-24 13:44:49 -05:00
Bryan Kowal
de0546ca99 Issue #1814 - use the AWIPS II log4j.xml for qpid
Change-Id: I99b34003e81686c2794acc8d3567189dc8c3b3d1

Former-commit-id: 715befa75c [formerly e720bf74b5] [formerly e00a6207a5] [formerly 715befa75c [formerly e720bf74b5] [formerly e00a6207a5] [formerly 35b956fc4c [formerly e00a6207a5 [formerly b7297cb67055cafdef19595e0e0a481a33a9552e]]]]
Former-commit-id: 35b956fc4c
Former-commit-id: 02f01470fc [formerly 49b9046bb4] [formerly a0bd420b00b18b43fbffb1d90f2d5c751a02e44a [formerly cbc2742070]]
Former-commit-id: f2ac9bf75c2eac62c3ddae97b705ade27423325b [formerly 39bae3cc54]
Former-commit-id: 6ad82744d2
2013-04-15 16:38:00 -05:00
Richard Peter
06b54e67c5 Issue #1814: Change baseline memory configuration and baseline default log configuration
Change-Id: I83969cb5ff2962fe293b8cfee02c4b7c4108f2c3

Former-commit-id: 81749b9af5 [formerly c10d2f7520] [formerly 0c869ee231] [formerly 81749b9af5 [formerly c10d2f7520] [formerly 0c869ee231] [formerly 78b230aaaf [formerly 0c869ee231 [formerly 6ce6d876a153a6fe0fd1c4939dae8b719ec470e3]]]]
Former-commit-id: 78b230aaaf
Former-commit-id: 227dcdbd81 [formerly a281d26608] [formerly 9271b9a667b720d809e7d8db48bb876251b35cf8 [formerly d967301cfc]]
Former-commit-id: b526a87e57e2ff9413674036431ad8b679510a09 [formerly 4e9789f56d]
Former-commit-id: ec77d423fe
2013-04-15 12:52:40 -05:00
Bryan Kowal
0b69be4a24 Issue #1750 - qpid updates for compatibility with operational servers
- ensure that AWIPS II Java is used
- installation will create the required qpid logs directory
- do not include the qpid-deps jar due to conflicting FOSS classes

Change-Id: I52f6f939fa1600e69b14966ac6eff998e35bc82f

Conflicts:

	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0


Former-commit-id: dd911d33bc [formerly 7af4c80bab] [formerly 1000dac7ad] [formerly dd911d33bc [formerly 7af4c80bab] [formerly 1000dac7ad] [formerly 1cea2404c8 [formerly 1000dac7ad [formerly e30dff6e530b247c01d6ff4cff826abcda92ff29]]]]
Former-commit-id: 1cea2404c8
Former-commit-id: c9666aa999 [formerly 8c20b1f4bc] [formerly 9883b0093f4fbc3aaa265cddbe9d5db095bd7555 [formerly 22a2c082b8]]
Former-commit-id: 62cfebe217bf8cddef962cf431fa6d694f753836 [formerly 5034964bfa]
Former-commit-id: 0c862db6f9
2013-04-04 13:20:13 -05:00
Bryan Kowal
db7ae2aab9 Issue #1750 - include the qpidd service script in the rpm installations
Change-Id: I8b90e0ffb1c0abc49ba55b55f3085c59e9b902de

Former-commit-id: 52fc0c66c2 [formerly 0d252800ee] [formerly a07f8076cf] [formerly 52fc0c66c2 [formerly 0d252800ee] [formerly a07f8076cf] [formerly 3454fd030b [formerly a07f8076cf [formerly 790804146d4eade073e3250e1b1cd95e313b1a96]]]]
Former-commit-id: 3454fd030b
Former-commit-id: 5cb707736a [formerly 59b2e35928] [formerly 61a29a2dc8e795045f30b007407d07cd9e3cc057 [formerly 3dadeb157d]]
Former-commit-id: d8eac6730a714ebf9eb92d1da7aa07a8835f01b8 [formerly 879b3bc84e]
Former-commit-id: 078622476d
2013-04-04 13:12:07 -05:00
Richard Peter
3abc53b70d Issue #1814: Baseline qpid 0.18 configuration and 0.18 java client
Merge local virtualHosts.xml back in with SLC change

Change-Id: Ia0f08a1d916895d33db9f170149cb9b05e00375b

Former-commit-id: 1d7d360f2c [formerly 91d708eaac] [formerly f77948929d] [formerly 1d7d360f2c [formerly 91d708eaac] [formerly f77948929d] [formerly 814bff6ddb [formerly f77948929d [formerly 20bbd926451ce82c606d80b238c5fbc720164910]]]]
Former-commit-id: 814bff6ddb
Former-commit-id: d1369dbf29 [formerly e9fe732dac] [formerly ce08d17392a7953ce37dadfeeddad3576552db03 [formerly 4337abd873]]
Former-commit-id: f0de5f6f544fadd3b91519c8f6322d053c734a6f [formerly 055440acda]
Former-commit-id: 52533b4f49
2013-04-04 13:03:41 -05:00
Steve Harris
fd735b8ff8 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300 [formerly f80f98cee2] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a]
Former-commit-id: 120fc26670
2013-03-25 13:27:13 -05:00
Steve Harris
745f2c6409 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Steve Harris
ed04125cd7 12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 0d8d18d7e2 [formerly e38e81ab8c] [formerly fd19ca5624] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: 424c32bd5d [formerly 684feb34e5] [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576]]
Former-commit-id: 8c6c58e31355710e22a13ff534f4c47d0ed7d0b0 [formerly 26b7d083ec]
Former-commit-id: e57e7237a9
2012-09-13 12:08:11 -05:00
Steve Harris
98059f9ef1 12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly 77cbd6c1e5 [formerly a1d931fd44] [formerly 61f269f54c] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed]
Former-commit-id: 2d928d328e
2012-08-21 15:27:03 -05:00
Steve Harris
7f90924706 12.4.1-10 baseline
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
2012-05-01 18:06:13 -05:00
Steve Harris
9340618732 12.3.1-10 baseline
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 11e448aa39 [formerly 8bc60b1e32] [formerly b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]]
Former-commit-id: cdb2bb52e23fe42c5a5b48dfdf59046836f2f615 [formerly 2e0f4b241b]
Former-commit-id: 293563cfe7
2012-03-30 08:38:33 -05:00
David Gillingham
13b2df8c41 Issue #417: Refactor HPEDhrSrv to work from a 2-stage queueing process.
Former-commit-id: edde99f0b8 [formerly 7e5ec12276] [formerly e13850a2b6] [formerly edde99f0b8 [formerly 7e5ec12276] [formerly e13850a2b6] [formerly d433b7d4d6 [formerly e13850a2b6 [formerly 727e2b19688397ea4608a2b6ca3fda3222b6ad36]]]]
Former-commit-id: d433b7d4d6
Former-commit-id: 9cc2c09ae5 [formerly 3c4e90e0bf] [formerly 0328fbf92c7293da9871a341342665168164a9a2 [formerly 2b5588bd1e]]
Former-commit-id: 5d55cc005839dda8cfa6803d81909c0ffb8ccde0 [formerly 2d82185a1d]
Former-commit-id: 69adfe2e40
2012-03-13 12:31:38 -05:00
Bryan Kowal
b29cbc5be3 Issue #202 - increment the awips2-qpid release so yum will update the qpid installation.
Former-commit-id: 6322415535 [formerly 5838ff71f1] [formerly fc1ca4efcc] [formerly 6322415535 [formerly 5838ff71f1] [formerly fc1ca4efcc] [formerly b871752e3a [formerly fc1ca4efcc [formerly ff79422d30a93ca71fc83e38e0368e499a34dd59]]]]
Former-commit-id: b871752e3a
Former-commit-id: 3e1e672233 [formerly d04bc82c9a] [formerly 3df9a673b587901bb723b61fae9fe68a607983cf [formerly 638d2c964b]]
Former-commit-id: 638e6f193c8e5f3613e0d0472cbb2ae78b006b0c [formerly 4c87af89f9]
Former-commit-id: 0c547b30ce
2012-03-08 09:00:55 -06:00
David Gillingham
9a3c195379 Issue #361: Use queueCreator.sh to build the new ISC data receive QPID
queue.

Former-commit-id: d3fcc3bc54 [formerly 15a9e7cdae] [formerly 90a745a037] [formerly d3fcc3bc54 [formerly 15a9e7cdae] [formerly 90a745a037] [formerly 78c7f29096 [formerly 90a745a037 [formerly cc6bca06f0fdb5919fe9ea9dc46eafd3d2d41a08]]]]
Former-commit-id: 78c7f29096
Former-commit-id: 038b850981 [formerly 5e2b3c3955] [formerly f703d811132f818c9f224c92beac74aea6d8f0ec [formerly 8a86e910aa]]
Former-commit-id: 6dc5df0140d31d3d91480386f33128d2b67b7fe9 [formerly b70345182d]
Former-commit-id: f91abb8deb
2012-03-07 16:05:54 -06:00
Bryan Kowal
a89f0a64f0 Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: d537df4ab0 [formerly 4453ad2d10] [formerly 65e1e4ee0b] [formerly d537df4ab0 [formerly 4453ad2d10] [formerly 65e1e4ee0b] [formerly ea1c82452b [formerly 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]]]
Former-commit-id: ea1c82452b
Former-commit-id: 69f4822ad1 [formerly 9f6780c4dd] [formerly e63dac039e52161602915d3cf34685762acd5d9e [formerly 7f1b468010]]
Former-commit-id: ed7bf459df1503ce7bd9500dc984c56a535b768f [formerly dafb6b18d8]
Former-commit-id: bb662ca175
2012-01-20 13:38:00 -06:00
Matt Nash
515196cb86 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00