Benjamin Phillippe
5d988cc5c1
Issue #1064 Fixed issue with grib splitter writing to nonexistent directories
...
Change-Id: I2b0246d3589074c29606a030f317d825cfc5f2e3
Former-commit-id: 04389b9f21
[formerly a501aacb3b
] [formerly a5c57e8d24
[formerly ccb9b1b4e9caf8523706535b141b0e54dd798c70]]
Former-commit-id: a5c57e8d24
Former-commit-id: c7bc786a60
2012-08-22 13:03:24 -05:00
Ben Steffensmeier
da05d2dd24
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: 596b48c490
[formerly e1c07b5803
] [formerly a988fdf5de
[formerly 61aab7b55f9868e69b43c5250515ce0d5b01d6e5]]
Former-commit-id: a988fdf5de
Former-commit-id: 4f16803030
2012-08-22 13:02:56 -05:00
Steve Harris
d974aaf277
Issue #915 Set the user data. (cherry picked from development_on_ss_builds)
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
Former-commit-id: 04c8c3ca55
[formerly 8e3ecc1efd
] [formerly b8629a0f20
[formerly ef64da82bb8594eddead221f7c5bf5fa95e4ff8b]]
Former-commit-id: b8629a0f20
Former-commit-id: 9565d18b96
2012-08-22 13:01:08 -05:00
Max Schenkelberg
919000d0dd
Issue #28 Finished True Color Dialog and resource to allow overriding and persisting in bundle custom ranges set from the dialog.
...
Change-Id: Ia2629964d8c31d18ec469b0f5030efb9fd87445e
Former-commit-id: e404398ea6
[formerly f381871fc4
] [formerly 6e1059f8be
[formerly a34c116fbbad86f758882461dd96da9c6ab14cdd]]
Former-commit-id: 6e1059f8be
Former-commit-id: ed033f8657
2012-08-21 11:36:35 -05:00
Nate Jensen
9c9f9a4989
Merge "Issue #28 Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes." into development
...
Former-commit-id: e29017c389
[formerly 87c70d25e8
] [formerly 1efe57fd02
[formerly 3c0e8a73dc372214352fab8ac91e2b68f11f78f2]]
Former-commit-id: 1efe57fd02
Former-commit-id: 521fc26db3
2012-08-21 11:02:22 -05:00
Steve Harris
94e981ae8b
Merge "Issue #989 - Adding markings to jasper" into development
...
Former-commit-id: 9165608ba0
[formerly 0693643152
] [formerly c2b21a4251
[formerly becc2dc6e147ae6f7caeaa872b8d9948b47dab1a]]
Former-commit-id: c2b21a4251
Former-commit-id: fc77903de7
2012-08-20 16:29:50 -05:00
Steve Harris
a7266b63fc
Issue #989 - Adding markings to jasper
...
Former-commit-id: 5ce7935576
[formerly ccc150c980
] [formerly 9e8f59f31d
[formerly 306b93cb3b73ae963b5900c8200d29a659689a74]]
Former-commit-id: 9e8f59f31d
Former-commit-id: 15462e7a38
2012-08-20 16:26:51 -05:00
Max Schenkelberg
47cefd1513
Issue #28 Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes.
...
Change-Id: I20bff443fe4c9b9330c0a66779218227c48df014
Former-commit-id: fc06265360
[formerly b69d2cad1c
] [formerly 1b406ecfca
[formerly 564b38b30562a371cf0345de572b32ea8f53e82e]]
Former-commit-id: 1b406ecfca
Former-commit-id: aa9df46a1d
2012-08-20 14:47:14 -05:00
Ben Steffensmeier
f6e7d795f9
Issue #666 fix collaboration message compose problems with ncp keybindings
...
Former-commit-id: 25b00010e1
[formerly 3f0b2e474c
] [formerly 8e971abbd8
[formerly ec779e0252ae7efd7228b7a0e1eea83b05b10c9b]]
Former-commit-id: 8e971abbd8
Former-commit-id: 2c5cfe6d98
2012-08-17 16:16:20 -05:00
Ron Anderson
6e3674f9fc
Issue #436 Made hazardDict an OrderedDict so order of entries is preserved.
...
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.
Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff
Former-commit-id: 16231374f8
[formerly d7a818fd1d
] [formerly 7662d249ab
[formerly 18f0efe7a8d9f2c31786fc449403f720b554b95d]]
Former-commit-id: 7662d249ab
Former-commit-id: d3693827a1
2012-08-17 12:41:49 -05:00
Ron Anderson
e5952c1c99
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: 93c632c1ff
[formerly 1321db6a99
] [formerly 819b9c8e56
[formerly 9287cf98369abb8a674fd5bab99439d055218a05]]
Former-commit-id: 819b9c8e56
Former-commit-id: 6eafdda705
2012-08-17 12:20:08 -05:00
Ben Steffensmeier
d7597d8cf7
Issue #1065 fix contexts to deactivate when unrecognized views activate.
...
Former-commit-id: e8524301b5
[formerly 6d9d0a406f
] [formerly 4203807a77
[formerly 5046660b52594a165d4a8749ac12c236d5ec027d]]
Former-commit-id: 4203807a77
Former-commit-id: 8a170234b8
2012-08-15 16:36:05 -05:00
Nate Jensen
1da09f201e
Merge "Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container" into development
...
Former-commit-id: d70d78d664
[formerly 2cb82b7170
] [formerly 91e0ba8c23
[formerly d252760b0e39002e53a5fce809b38521ca2351aa]]
Former-commit-id: 91e0ba8c23
Former-commit-id: 5b26d1e93e
2012-08-14 16:52:40 -05:00
Ron Anderson
c8b0719d48
Issue #1052 Fixed GridLocaton.gridCell to return Point instead of Coordinate.
...
Change-Id: I1bbf11738ec0595d42d88423bb9b6ef9d42468e2
Former-commit-id: bac68cc1de
[formerly 17f636c2a2
] [formerly 81abb2c60b
[formerly 373ac200fcd1c9a39244a2775d95c7b891334632]]
Former-commit-id: 81abb2c60b
Former-commit-id: 7cde30681b
2012-08-14 16:27:11 -05:00
Steve Harris
118113bd60
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 27fa10e133
[formerly e3927a11c7
] [formerly e530637aa3
[formerly 43d4642bc39a053d40fce9b6aff1d11f3d313dd7]]
Former-commit-id: e530637aa3
Former-commit-id: 1687889756
2012-08-14 16:26:00 -05:00
Ben Steffensmeier
36455cfbed
Issue #947 revert changes to dataTime format
...
Former-commit-id: 54b538bb07
[formerly 50cb7383a6
] [formerly 70ba8d82db
[formerly 53a441f310e35d80ceb0ff28c156bf15ba1b5893]]
Former-commit-id: 70ba8d82db
Former-commit-id: 77b7c4c517
2012-08-14 16:20:36 -05:00
Ben Steffensmeier
2ac8180928
Issue #1058 fix reprojection of wind vectors
...
Former-commit-id: 28aae9f11f
[formerly ba9d0b25b5
] [formerly 9c727d2e33
[formerly 8fdc9841f9033720aa0ceb6389e7b1403d75a2d5]]
Former-commit-id: 9c727d2e33
Former-commit-id: e65832b2bf
2012-08-14 16:15:19 -05:00
David Gillingham
5ce4e54db9
Issue #1055 : Fix coop precip breakage from Wes2Bridge db changes.
...
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad
Former-commit-id: e541c86f1b
[formerly f40fc68c28
] [formerly 79a77a38a4
[formerly 03f9de1860008cd1a2b4b60576802a67a8a447fa]]
Former-commit-id: 79a77a38a4
Former-commit-id: dd80a94061
2012-08-14 16:15:10 -05:00
Ben Steffensmeier
48963ebc07
Issue #1018 change product browser to handle no editor conditions better.
...
Change-Id: I3235ebb6d50eee26c75d31ce91e2a01c2d49b300
Former-commit-id: 6267bdb915
[formerly 4d20aa0e82
] [formerly 7559065a1d
[formerly 7cb30aa5c00eea5b95b6c4b39653fabeaccdd872]]
Former-commit-id: 7559065a1d
Former-commit-id: 850203f715
2012-08-14 15:23:34 -05:00
Ben Steffensmeier
08021bcfc2
Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container
...
Former-commit-id: 474fe44037
[formerly a4c46c7f55
] [formerly 0857d971b5
[formerly 7ae4af9778cfa58fc755041479aadec5e6ad90b0]]
Former-commit-id: 0857d971b5
Former-commit-id: a02bb2c092
2012-08-14 10:25:38 -05:00
Max Schenkelberg
107efcaee3
Issue #28 Implemented generic true color resource with new extension. Wrote new, more efficient, accurate, and scalable TileSet rendering/managing code to replace AbstractTileSet which VIIRS uses since it took over 10s to load a single frame of data with AbstractTileSet and around 20-30s to load a single true color frame of VIIRS. Put true color code in separate projects to encapsulate functionality. Resources need not depend on these projects, they just have to set the ImagingProvider in their ImagingCapability and true color resource can be loaded through a bundle file.
...
Change-Id: I624edb115b02611470e2e434e27759c45600111c
Former-commit-id: d6522f8e3a
[formerly 93e8619fa5
] [formerly 09b0db0a13
[formerly 7d75620c07c992ab74a8305a69ed87817f8f0639]]
Former-commit-id: 09b0db0a13
Former-commit-id: 784c43ab7c
2012-08-13 12:20:05 -05:00
Ben Steffensmeier
d52dd42ab2
Issue #1004 change plots to synchronize with dispose instead of joining since join allows paint to happen
...
Change-Id: I6011a5fedc155ab8d515d3c6eb5d368f582c59bd
Former-commit-id: 6f178a9150
[formerly 603a9c90e4
] [formerly 559efb19fb
[formerly aece671b35405e1f278439c9a1a8230dad5cf4c2]]
Former-commit-id: 559efb19fb
Former-commit-id: 3f258a2bf8
2012-08-13 09:54:22 -05:00
Ben Steffensmeier
0af9fd4fe2
Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings.
...
Former-commit-id: 573cc270e8
[formerly c6a121962f
] [formerly 1e527f83f0
[formerly 06c2c85159598ca803c663de97caed4b6841c135]]
Former-commit-id: 1e527f83f0
Former-commit-id: c9ff69014b
2012-08-09 17:53:19 -05:00
Ben Steffensmeier
54b3078ad1
Issue #947 fix parsing of DataTime.
...
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04
Former-commit-id: 8d118c392a
[formerly 525c0b21a9
] [formerly b53fe917bc
[formerly 045952304218c867d8fe89df9828f70632df2d00]]
Former-commit-id: b53fe917bc
Former-commit-id: 4ed3d04e64
2012-08-09 17:50:23 -05:00
Ben Steffensmeier
0e48e6e4fd
Issue #1004 make dispose/shutdown of plot jobs more permenant by joining.
...
Former-commit-id: 3f92e385a6
[formerly 3abfef55cc
] [formerly c1bacb33b1
[formerly 6cb8e45b4f3a78abcfeee982306684eef025fd3d]]
Former-commit-id: c1bacb33b1
Former-commit-id: f711cfdae2
2012-08-09 17:45:19 -05:00
Jonathan Sanchez
cc261d9ce2
Issue #883 Sorted warning records and prevented altered entries to be in
...
the same frame as new entries.
Former-commit-id: 17a3198056
[formerly 051b63c3e9
] [formerly df301c2e03
[formerly cfaece96bd77aef32073400c1abaf0bf8cd3f103]]
Former-commit-id: df301c2e03
Former-commit-id: 200ed3c3fb
2012-08-07 14:50:15 -05:00
Max Schenkelberg
1aa6d193b4
Issue #626 Fixed GLStats to print proper message name. Fixed SatelliteDao to correctly use UnsignedByteArrayWrapper to properly reflect data. Modified UnsignedShortArrayWrapper to extend ShortArrayWrapper like Byte/UnsignedByteArrayWrapper does. Fixed DataTime legend generation when time range is not even hour increment
...
Change-Id: Ie79883c1d901f24042234fe5e79b5ae903e5792b
Former-commit-id: ae3b62ca12
[formerly 36bf80d13e
] [formerly 0031d21292
[formerly b0466e68bea4102f397db214bb58b66c10a338ed]]
Former-commit-id: 0031d21292
Former-commit-id: 482dfb4711
2012-08-06 09:44:44 -05:00
Ben Steffensmeier
83effa4f85
Issue #988 set statem bits on underlieing image for GLDelegate Image
...
Former-commit-id: 6e3cd8976b
[formerly 0f7dd0f4cd
] [formerly 5fe65c6538
[formerly 39444045f7cc4f4e4fac86b15ca7b98cf2cb9ded]]
Former-commit-id: 5fe65c6538
Former-commit-id: 6ccc09e0b4
2012-08-03 16:39:33 -05:00
Ben Steffensmeier
5954717c26
Issue #978 GChange GridResource to use its own times rather than descriptor times.
...
Former-commit-id: c5c9e8b05c
[formerly 8346805ed2
] [formerly 090b9f5ccb
[formerly 1481f818fed5ff9f18387d8fcbd9c30da37a9dd7]]
Former-commit-id: 090b9f5ccb
Former-commit-id: 942b0e5315
2012-08-03 15:52:47 -05:00
Richard Peter
3984511a6e
Merge "Issue #798 - Force interpolationLevels in derived satellite" into development
...
Former-commit-id: 2154c4e286
[formerly fd051c19d4
] [formerly 131ba842e9
[formerly 622e8119ab53ed34e5249c67186343203a56b821]]
Former-commit-id: 131ba842e9
Former-commit-id: c61f4f8245
2012-08-03 14:32:35 -05:00
James Korman
93a1311cf9
Issue #798 - Force interpolationLevels in derived satellite
...
Former-commit-id: dfd18c7a85
[formerly 1bc1784478
] [formerly 317acc38fe
[formerly ffcc7cfa6e7c2ce0f406becff390781ceee7faa3]]
Former-commit-id: 317acc38fe
Former-commit-id: b27f4fb5e5
2012-08-03 14:14:53 -05:00
Ben Steffensmeier
ceaf86128c
Issue #1001 synchronize paint with add.
...
Former-commit-id: 3e601b2baf
[formerly 2c9737ca5c
] [formerly 798d26e954
[formerly 825c08e6ce89b0c4b042c9e85f7abbc7b9a675ef]]
Former-commit-id: 798d26e954
Former-commit-id: e9cde98072
2012-08-03 14:10:04 -05:00
Nate Jensen
ca6dbc6be6
Merge "Issue #666 re-enable CAVE menu in NC perspective, remove extra help menu" into development
...
Former-commit-id: 689dcd5d4d
[formerly c74a54b9ed
] [formerly 47920c3168
[formerly 9207aa6af20bd76369a5952bd836526ce6d7197f]]
Former-commit-id: 47920c3168
Former-commit-id: 528f6045e9
2012-08-03 10:43:39 -05:00
Bryan Kowal
185daa58d9
Issue #997 - the scripted CAVE pde build will now only default to /opt/uframe-eclipse if the user has not specified an alternate eclipse location.
...
Change-Id: Ib9b5bbd3f89b0a241c7eb1865895e232ac8d85f7
Former-commit-id: 40e69fad53
[formerly e371bd14dd
] [formerly 08651d2c21
[formerly 1adbccde6ba44233e9d0cd7e3b9d5220cef64d06]]
Former-commit-id: 08651d2c21
Former-commit-id: a70bbf3e4d
2012-08-02 16:13:58 -05:00
Bryan Kowal
14c20083b0
Issue #797 - deploy-install improvements; removed references to non-existent files from build.properties.
...
Change-Id: I5e00c2fd9156c1e8d8a23a3abbefb688f5342a36
Former-commit-id: dd1acbe70a
[formerly c6b2d65308
] [formerly 5ca4a66fdc
[formerly d64577e7804cc8a235efebff53722bac3cde9cc7]]
Former-commit-id: 5ca4a66fdc
Former-commit-id: f295ee11ea
2012-08-02 10:33:55 -05:00
James Korman
4226007a10
Issue #798 - Updates to satellite
...
Former-commit-id: fd1156d67d
[formerly 7928d912e1
] [formerly 2ddb2f6df0
[formerly 0fbc98c1fbbf683e14cf39ed962308496dff67dd]]
Former-commit-id: 2ddb2f6df0
Former-commit-id: 241303f9a0
2012-08-01 16:31:59 -05:00
Bryan Kowal
5b7330ca01
Issue #970 - ensure that g2int has the same definition throughout grib2 and all dependencies; updated variable types based on function signatures.
...
Change-Id: If25d724c18ff5a9d09f94d77304ec729866158e6
Former-commit-id: 6126e4316a
[formerly 485334331a
] [formerly d07281ac51
[formerly 4dc6be0e1bf32b126a0685109131e1b4b3f5acd1]]
Former-commit-id: d07281ac51
Former-commit-id: 024a23e7a3
2012-08-01 11:50:24 -05:00
Max Schenkelberg
81ce682e0b
Issue #626 Fixed changes to GridDownscaler in SatelliteDao
...
Change-Id: Iec25035585349f1d6b7a4d975df0faf0e4dc3f90
Former-commit-id: c3daf20fdf
[formerly 2d36eb040d
] [formerly d89b58f7fd
[formerly 1370a27f85173509b66a7ea861ed0b04225709e0]]
Former-commit-id: d89b58f7fd
Former-commit-id: 9f34d7a5f3
2012-08-01 11:36:44 -05:00
Max Schenkelberg
7ee188d90a
Issue #626 Changed downscaler so it can scale from any level to another level instead of always using full resolution level. Fixed Float.NaN reference in AbstractDataWrapper. Fixed GLMesh leak in AbstractTileSet.
...
Change-Id: I5e36d3a7632f54c19c81818c270b28ac60a385ac
Former-commit-id: 079a11565a
[formerly f635e9c332
] [formerly cc0a1fbca3
[formerly 0f59e9ea9e204bc49e14135249ef859903a2cbcb]]
Former-commit-id: cc0a1fbca3
Former-commit-id: 74f0179b92
2012-08-01 10:51:32 -05:00
James Korman
540435baa6
Issue #798 - Code review changes
...
Former-commit-id: f7a864a2c0
[formerly 14e68406b4
] [formerly 39a32d7c91
[formerly c58e900204016e026c6023e7beb33bc82a6cdeaf]]
Former-commit-id: 39a32d7c91
Former-commit-id: 15af4ada93
2012-07-31 14:34:27 -05:00
James Korman
16643cb1bc
Issue #798 - Code review changes
...
Issue #798 - Code review updates
Change-Id: I5447574392a42c79fa4295ce4f9bb5ac295d06bb
Former-commit-id: 1166a7cbb1
[formerly 38a2e426d9
] [formerly 4cbbc59278
[formerly cb05a9f95384806537106dc804833331d6c7db48]]
Former-commit-id: 4cbbc59278
Former-commit-id: 5df52e38f9
2012-07-31 13:38:23 -05:00
Nate Jensen
9ca861b827
Issue #666 re-enable CAVE menu in NC perspective, remove extra help menu
...
Change-Id: I103017fef97b6f7992f753eb17737201bf0a4f64
Former-commit-id: 8539a075bb
[formerly ae7c427b4b
] [formerly 69f51e6e87
[formerly e3b8f1e0c5d1e5d9fa7446124bc7c3c0b98a967c]]
Former-commit-id: 69f51e6e87
Former-commit-id: 00bbb6c8a3
2012-07-31 10:02:39 -05:00
Richard Peter
96e3782774
Merge "Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks." into development
...
Former-commit-id: 4f64038c78
[formerly 97a1d083cd
] [formerly 8631b64e75
[formerly 4b7c1b1876f07de56c8f915d7c4a9c7707ccdf13]]
Former-commit-id: 8631b64e75
Former-commit-id: c379c2f884
2012-07-31 09:16:23 -05:00
Nate Jensen
7d478ac74c
Issue #882 improved use of SimulatedTime
...
Change-Id: I624427fe42f0d74bc62900216596e724857830fc
Former-commit-id: 6f90bfa61c
[formerly a65e9608fd
] [formerly 4a2841b287
[formerly 0deb4ff6eb3dc1aa794916b84a6530b5d77a8b25]]
Former-commit-id: 4a2841b287
Former-commit-id: 8fa0eb70db
2012-07-31 08:57:54 -05:00
Ron Anderson
4efd9149f7
Issue #851 change date formatters to use ThreadLocal instead of synchronized blocks.
...
Change-Id: I1d3818cf90d21d3cc725b9a83e55eb5068b7aa62
Former-commit-id: e9f24e8660
[formerly 7c6686f2f4
] [formerly b1650b6143
[formerly 181fba1a75357aa39a54267c6df907075f4601dc]]
Former-commit-id: b1650b6143
Former-commit-id: 6a3e6f599f
2012-07-31 08:36:27 -05:00
Ron Anderson
4459afa40c
Issue #851 removed obsolete GFE code.
...
Change-Id: I3713b0e265bec9e32cde3c20bc4dae12f6b20a02
Former-commit-id: 74478728de
[formerly 35d140f0fb
] [formerly d87c0b6c4b
[formerly c91b6fc2c506096f37f175e8196f9aaeb356141d]]
Former-commit-id: d87c0b6c4b
Former-commit-id: 6b7f1b3611
2012-07-30 15:34:16 -05:00
Bryan Kowal
d27bdae074
Issue #969 - the top-level directory structure of i386-pc-linux-gnu.tar has slightly changed?
...
Change-Id: I29cae68e2d87ea8ff078d6ac56211da548e7074f
Former-commit-id: 69bea08034
[formerly c74e48e4a4
] [formerly aa5b16537f
[formerly 1b7f01a2e8afdf900dae4b124c7b17b91ac68f3d]]
Former-commit-id: aa5b16537f
Former-commit-id: 9fe0b6a424
2012-07-29 09:40:01 -05:00
Bryan Kowal
6ac43a3c0c
Issue #969 - removed the individual build of edex-ost; added a feature for edex-ost; the new build will now recognize edex-ost
...
Change-Id: I3458f32cd994e9fc663116d4930451cefd1cd2f6
Former-commit-id: 67035fa0b8
[formerly 327ffa9439
] [formerly cd40d9accf
[formerly dca54e56436ace397c6163b03ac4edb480336404]]
Former-commit-id: cd40d9accf
Former-commit-id: 107831f23d
2012-07-28 08:52:36 -05:00
Richard Peter
b6a1b5011f
Merge "Issue #626 Moved data unzipper and wmo header remover to common so it can potentially be used by GOES-R" into development
...
Former-commit-id: 1de59b48cf
[formerly 9e3cd2546a
] [formerly 77c2ab2c05
[formerly 39e74c7e2aa9f78938c85d0433decb89f4ef1325]]
Former-commit-id: 77c2ab2c05
Former-commit-id: d131cd42cf
2012-07-27 14:50:00 -05:00
Steve Harris
f2ab9cfe1a
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 302aa05586
[formerly de9034c96c
] [formerly 4688ac304f
[formerly d2a398126648eaf391ddf39f99a77c0f40d08618]]
Former-commit-id: 4688ac304f
Former-commit-id: b82d6772c3
2012-07-27 14:50:45 -05:00