Commit graph

42 commits

Author SHA1 Message Date
Brian Clements
7ff7c235e8 Omaha #3608 improved error handling in lightning frame retriever
Change-Id: I02784a7f2d23bf37d56294e55cb9ec759d1f9080

Former-commit-id: c56645dd01 [formerly b9dd6d798b [formerly 0551b91b995c893fddee52cabdfbdccf83121a31]]
Former-commit-id: b9dd6d798b
Former-commit-id: ce24dad434
2014-09-11 11:52:23 -05:00
Steve Harris
3619a11a8a Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.tools.cli/impl/capture
	ldm/src/pqact/pqact.c

Former-commit-id: 5d58625abc [formerly 793064063b [formerly 8793dca41f756ba812206b48391caea6e593a657]]
Former-commit-id: 793064063b
Former-commit-id: bddf9c0f27
2014-08-29 10:17:52 -05:00
Brian.Dyke
0a5ddf7457 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]
Former-commit-id: e654318431
Former-commit-id: a08db8d73d
2014-08-27 11:19:19 -04:00
Steve Harris
33b4901c09 Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java

Former-commit-id: 038b284066 [formerly 99ae9bdc10 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]
Former-commit-id: 99ae9bdc10
Former-commit-id: 8c5026314c
2014-08-26 16:25:21 -05:00
Brian Clements
7ac071e0f9 Issue #3542 fixed lightning count clipping issue
Change-Id: I40aa62558542d3da9b3abd8f82de9e5d8244870b

Former-commit-id: fc2e7f52b9 [formerly 78796c3f6e [formerly 937c656ba2a9fc98bfa5655a5020d470f83b898f]]
Former-commit-id: 78796c3f6e
Former-commit-id: 9e33cf1f5f
2014-08-19 09:00:58 -05:00
Brian Clements
8b10703f28 Issue #3488 added sanity check for bin range in lightning viz resource
Change-Id: I23ec1614821dcbc18c06f58e3ef00371988fc30a

Former-commit-id: 30ca12aae7 [formerly 7b312ab6a7 [formerly 701b56ec37053654e64cfd6ea831aad4ea7b9d8a]]
Former-commit-id: 7b312ab6a7
Former-commit-id: dfc3545bf5
2014-08-04 11:22:12 -05:00
Brian Clements
859b0a592e Omaha #3463 grid lightning uses sparse data source
Change-Id: I243b3a662bf1f3ab320ef5fee7637fd5245e8ad3

Former-commit-id: c1f5fe0d3a [formerly e755fc88a7 [formerly 00b60fd6ed95f3df30b1f477619ace9145d17f45]]
Former-commit-id: e755fc88a7
Former-commit-id: de536146c1
2014-07-29 14:30:57 -05:00
Brian Clements
dba2a97392 Omaha #3451 extended colorbar range for grid lightning
Change-Id: Ia734b28b6d1b0daf8c257d2cc72c2aca1bd2de46

Former-commit-id: 334f5f107e [formerly a16643a3d0 [formerly 7d3789e0832e7be5b0a87176cbf26509b6f3c708]]
Former-commit-id: a16643a3d0
Former-commit-id: 98b6917185
2014-07-29 10:30:10 -05:00
Brian Clements
8667192f2e Omaha #3450 fixed grid lightning menu ids so more than one can be torn off at a time
Change-Id: I413bb4ff91aa3ad0c56d386c8466400afbf58204

Former-commit-id: ac0db6291b [formerly eedea4e6ce [formerly 662bd201dba808edcce74aeafa1257a157e6b6ea]]
Former-commit-id: eedea4e6ce
Former-commit-id: 48c7c979c0
2014-07-28 12:51:07 -05:00
Brian Clements
3c73726be1 Omaha #3333 grid lightning image by default, log style rule
Change-Id: Iaec485a35cce1deba7943ae4550c004badbf0a32

Former-commit-id: e5a63e5cf5 [formerly a6b414bd1f [formerly 127cdbea94ed37f0a2c3ddf113df8f093549d077]]
Former-commit-id: a6b414bd1f
Former-commit-id: e018ec56dd
2014-07-24 13:34:43 -05:00
Nate Jensen
5751c78426 Merge "Omaha #3214 fixed typos in LightningFrameRetriever" into omaha_14.4.1
Former-commit-id: 3128374080 [formerly 464e252e96 [formerly 5a2968189edd1abe58560404fc01dcea82957b5f]]
Former-commit-id: 464e252e96
Former-commit-id: fd997ad030
2014-07-22 14:01:08 -05:00
Brian Clements
6e61d1b0bb Omaha #3333 grid lightning ignores strikes outside of map
Change-Id: I188aac28b50b7ac8a107d785b52471c1d7fe6d14

Former-commit-id: 62dcdda0bc [formerly a9284b35ff [formerly bb55bde76765d330f782524965fe79d5373b6e9f]]
Former-commit-id: a9284b35ff
Former-commit-id: 0bd9bb7c21
2014-07-22 13:42:18 -05:00
Brian Clements
7949037995 Omaha #3214 fixed typos in LightningFrameRetriever
Change-Id: I1616b5f64c3d6c99f034c7f7c526a453e0f5578c

Former-commit-id: 3f82ead0b5 [formerly 45d52c2298 [formerly 7f5868947a0c7bee586908f832f3bb9030c3e84e]]
Former-commit-id: 45d52c2298
Former-commit-id: 319cbe37b3
2014-07-22 13:33:26 -05:00
Brian Clements
f969720868 Omaha #3333 added grid lightning to cave
Change-Id: I4e5d21c39168bac285125a39fd148fe69906f221

Former-commit-id: 29fc7e7ec4 [formerly a50f1e8e70 [formerly 33736a713a2c360e70f5a06972a7a21937f2b34c]]
Former-commit-id: a50f1e8e70
Former-commit-id: 555251982b
2014-07-11 12:18:05 -05:00
Brian Clements
392b640b47 Omaha #3333 removed redundant field from viz lightning
Change-Id: I3821f7991757f97b976bac8cde502da977ea0978

Former-commit-id: e4795f6a13 [formerly 572d95e78a [formerly 2e701ade395cb2ec81d86af714fad825e146dc25]]
Former-commit-id: 572d95e78a
Former-commit-id: 91b136c2a0
2014-07-07 15:13:28 -05:00
Richard Peter
ed38bf2372 Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py

Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61

Former-commit-id: 8ecc27f714 [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]
Former-commit-id: 93bbd98cbc
Former-commit-id: 6636b301e5
2014-07-01 15:34:39 -05:00
Steve Harris
741dc31fcb Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/sbu/ServiceBackupDlg.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
	edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5

Former-commit-id: 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]
Former-commit-id: d4dc1723c1
Former-commit-id: 2f2958df37
2014-07-01 11:08:46 -04:00
Steve Harris
869235c02a CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)

Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java

Former-commit-id: 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]
Former-commit-id: b84dda5930
Former-commit-id: 16f5ff0979
2014-06-20 14:01:55 -04:00
Brian Clements
24e406cbf2 Omaha #3214 added pulse and cloud flash rendering to cave
Change-Id: Ibb842c0088b959e9ffc88c4db51f4c1bcc77d3ce

Former-commit-id: a18069809a [formerly 7dd90e6f85 [formerly 136bb5feca753f83f53d9d1e9381061853edc402]]
Former-commit-id: 7dd90e6f85
Former-commit-id: 6345119f9b
2014-06-19 12:50:56 -05:00
David Friedman
350566a514 ASM #604 - Lightning display varies depending how long CAVE has been open
Change-Id: Id85b87e21833ef00e80693b8526d976ccb4bb63e

Former-commit-id: 1c84c31e30 [formerly b8542c1332 [formerly a3f4fd6537f3847011e199e0f043968d9f595937]]
Former-commit-id: b8542c1332
Former-commit-id: 6d0d3f5ba5
2014-06-11 13:37:16 +00:00
Brian Clements
eb782b8201 Omaha #3226 added total lightning decoder
refactored binlightning to support pulse data
renamed strikeCount dataset to pulseCount
added initial cave support for total lightning

Change-Id: I67f8a0f26a615ddefb9ff7f7d7d78bb05f0877f3

Former-commit-id: f39896b2d1 [formerly c278000764 [formerly e2583481a77d08249030838ebd52eed6e54b2986]]
Former-commit-id: c278000764
Former-commit-id: 2e445986e2
2014-06-06 14:39:57 -05:00
Everett Kladstrup
eab1358602 Issue #2725 Move derived parameters logic to common
* Make derived parameters not use VizException
* Move derived parameters packages from the viz hierarchy
  to the common hierarchy
* Move data cube classes that don't depend on derived parameters
  to thier own plugin
* Moved DataCubeContainer and supporting frontend classes from
  viz.core to viz.datacube


Former-commit-id: 0699041518 [formerly 06d6961c0f [formerly ad4a8cfbbc6de72810492c8f1de9701d381b6019]]
Former-commit-id: 06d6961c0f
Former-commit-id: 8b19b3601a
2014-04-09 09:31:12 -05:00
Steve Harris
08dbf1f7ea Merge branch 'omaha_14.2.1' into development (from 14.2.1-9)
Former-commit-id: 1c64a5c025 [formerly 8b6263bfbd [formerly 857ae00bea95a7981cb4752c1a7c147d725173e3]]
Former-commit-id: 8b6263bfbd
Former-commit-id: dc7d6ceced
2014-03-06 18:31:10 -06:00
Steve Harris
93aa41a34b Merge branch 'master_14.2.1' into omaha_14.2.1
Former-commit-id: a2e36f4c6c [formerly 7f1ad89df9 [formerly 22538918b8a7175bbb517cbf65ec3738e65a6eb2]]
Former-commit-id: 7f1ad89df9
Former-commit-id: 3358e8d6ef
2014-03-06 18:19:55 -06:00
Brian.Dyke
972c2c284b ASM #124 - Display GLD360 lightning data
Former-commit-id: eefe8c45fe [formerly db274c890f [formerly 1edba9216beac913f9bd867da9988e213394a396]]
Former-commit-id: db274c890f
Former-commit-id: bd81ebd8c2
2014-03-06 10:54:15 -05:00
Brian Clements
dedd9e80ed Issue #2667 fixed bin lightning menus
the column name for the source of the lightning data was changed


Former-commit-id: 7a7d476899 [formerly 91936beadf [formerly 62e8a279840672f1ee2bb9f3ecf982c80a04d83c]]
Former-commit-id: 91936beadf
Former-commit-id: 5d21675a91
2014-03-03 13:17:05 -06:00
Richard Peter
79d3aa4e1a Merge branch 'omaha_14.2.1' (14.2.1-8) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.textlightning/src/com/raytheon/edex/plugin/textlightning/impl/TextLightningParser.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/response/GridResponseData.java
	edexOsgi/com.raytheon.uf.common.dataaccess/src/com/raytheon/uf/common/dataaccess/util/PDOUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth.ncf/src/com/raytheon/uf/edex/datadelivery/bandwidth/sbn/SbnSimulator.java

Change-Id: Ia74f80ced9091ff0497ccc6d93e876b5a9807f75

Former-commit-id: 1c150e6e8b [formerly 0e25ae35c1 [formerly a47eaa9af45db41391fe46e36ec0793f70d06ad6]]
Former-commit-id: 0e25ae35c1
Former-commit-id: 7bd6a07913
2014-02-27 15:18:26 -06:00
Richard Peter
ae39697315 Issue #2509: Fix merge of SS #124
Change-Id: I853f6b877a66cd7cb002ea3487dcffc783f902f1

Former-commit-id: d54fee5dae [formerly 729d608a15 [formerly 998ccfc1af2ca9c217151f353a8617ace8a1c18c]]
Former-commit-id: 729d608a15
Former-commit-id: a23c8f2c27
2014-02-27 13:20:49 -06:00
Brian.Dyke
6d35a4b1bc Issue #124
Former-commit-id: 0cc11ddfd3 [formerly 439f053309 [formerly e192f01952d7779f03db819c0a04aa7f6cd0c88e]]
Former-commit-id: 439f053309
Former-commit-id: 3ba93b175e
2014-02-04 16:56:47 -05:00
Brian Clements
ff97757a38 Issue #2667 added bin lightning data access factory
renamed lightning record's lightSource field to source
added delta script for db column change
added attribute method comments for IData and DefaultGeometryData


Former-commit-id: bd9fbc5f38 [formerly 402bef9c5b [formerly b6c50729919ea8a9b29ca963e18f68268c3a0b7f]]
Former-commit-id: 402bef9c5b
Former-commit-id: 54516275f1
2014-01-23 09:32:18 -06:00
Ben Steffensmeier
230309c25f Issue #2491 Remove uneeded ISerializableObject files.
Former-commit-id: cac1f07cbb [formerly c14cc609a8 [formerly fd4cc4fde9507cd9abbf394ea5823a8f315c7d55]]
Former-commit-id: c14cc609a8
Former-commit-id: f34bfc1e5b
2013-10-25 15:31:39 -05:00
Max Schenkelberg
3509baaa74 Issue #2277 Switched DataCubeContainer calls to not use ScriptCreator
Amend: Added comments as requested

Change-Id: Ib787d43638f20babfc7f89ce2eac958e31d21c3c

Former-commit-id: 2d1db7d0e2 [formerly b633f9987a [formerly efb402d2835f715143cddffeec2bd7c20d0a65f6]]
Former-commit-id: b633f9987a
Former-commit-id: 8a500677d3
2013-09-09 10:10:11 -05:00
Max Schenkelberg
9be1171c33 Issue #2033 moved bundles and menu files into corresponding plugins
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc

Former-commit-id: 06dbae8bdb [formerly 5ab8b6e2c6 [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]]
Former-commit-id: 5ab8b6e2c6
Former-commit-id: 6c92aa9dd7
2013-08-14 09:20:28 -05:00
Nate Jensen
8838a7ee75 Issue #2142 clean up dependencies and dead code
Change-Id: I30f94c9afb01cdd1b7bef98c6ba40f79c3acea59

Former-commit-id: f28420dac4 [formerly a636846295 [formerly 593073cade120a95899f4f4d2c5a652c6ac3389a]]
Former-commit-id: a636846295
Former-commit-id: c4bc1ef034
2013-07-17 16:30:08 -05:00
Steve Harris
4eef6862d6 13.3.1-6 baseline
Former-commit-id: 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 3a4c7931e1
Former-commit-id: 2e110bd151
2013-03-12 08:35:45 -05:00
Steve Harris
52f48669f6 13.2.1-6 baseline
Former-commit-id: a46e33f06e [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: d0752de66c
Former-commit-id: d66ad2f77b
2013-02-07 16:00:39 -06:00
Steve Harris
e8f4a2f031 13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: c0c1d56f3a
Former-commit-id: 51208e5515
2013-01-06 14:32:24 -06:00
Steve Harris
ddc923e3e0 12.10.1-4 baseline
Former-commit-id: 92cc2d8605 [formerly 791ef6cedf [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]
Former-commit-id: 791ef6cedf
Former-commit-id: 9cd1f3ec0f
2012-09-13 12:33:36 -05:00
Steve Harris
77cbd6c1e5 12.9.1-5 baseline
Former-commit-id: f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
2012-08-21 15:27:03 -05:00
Steve Harris
4767b0e069 12.4.1-4 baseline
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
2012-04-18 15:18:16 -05:00
Matt Nash
d8da2252c3 Moving 12.1.1 into ss_sync
Former-commit-id: c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: 66be3bec40
Former-commit-id: 580e2938d7
2012-01-19 11:53:12 -06:00
root
133dc97f67 Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
2012-01-06 08:55:05 -06:00