xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
832 commits 31 branches 40 tags 3.8 GiB
Commit graph

832 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lee Venable
b42d389cb2 Merge "Issue #1055: Fix coop precip breakage from Wes2Bridge db changes." into development_on_ss_builds 
Former-commit-id: fe9a85cefb [formerly 457d099cca] [formerly 2c2a3f4aec [formerly cf7be4b4a2a49f365258f1ac6262b64e86e705e4]]
Former-commit-id: 2c2a3f4aec
Former-commit-id: a3651c5813
 2012-08-14 14:26:10 -05:00
Ben Steffensmeier
6207cd7310 Issue #1058 fix reprojection of wind vectors 
Former-commit-id: 283781ba03 [formerly c25c08c8e7] [formerly 09c412d754 [formerly 315965383123120bffe1faa1d63fdfb7b633bc97]]
Former-commit-id: 09c412d754
Former-commit-id: ea551d3866
 2012-08-14 13:44:21 -05:00
David Gillingham
35ac266c34 Issue #1055: Fix coop precip breakage from Wes2Bridge db changes. 
Change-Id: Idbbbf7622483c426efc715f9e8eb185be6d47bad

Former-commit-id: 06e789e986 [formerly b587c1ea4f] [formerly f2795370d1 [formerly da6811db78e3fcf57acc25e417ec8319c1dceecf]]
Former-commit-id: f2795370d1
Former-commit-id: e51d931a5a
 2012-08-14 13:36:51 -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
Nate Jensen
c0fa1e8cf2 Merge "Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings." into development_on_ss_builds 
Former-commit-id: 32cc46ec4e [formerly eeaa2c798f] [formerly 4211a8deac [formerly 70f2bcb38c03eee2d389774f92a4676b0d4cae43]]
Former-commit-id: 4211a8deac
Former-commit-id: 2cc3c63ba7
 2012-08-09 17:18:38 -05:00
Ben Steffensmeier
e03eb5f5c9 Issue #947 remove milliseconds from obs, change avnfps to use dbqueryrequest to get Dates instead of CatalogQuery to get Strings. 
Former-commit-id: 64caa963b1 [formerly 066a5af2a6] [formerly ad1415948f [formerly 51acdac79ebfa11abb5d69707a0a7b059e1a2e57]]
Former-commit-id: ad1415948f
Former-commit-id: 65c33256d9
 2012-08-09 17:16:38 -05:00
Jonathan Sanchez
3952dfc7ac Issue #883 Sorted warning records and prevented altered entries to be in 
the same frame as new entries.


Former-commit-id: 4f2d6630c1 [formerly 6507a97665] [formerly fa7795d17f [formerly 5c8c0783c8e054792ac38b4487188495dd0b0319]]
Former-commit-id: fa7795d17f
Former-commit-id: 7ad6329fe0
 2012-08-09 08:26:21 -05:00
Nate Jensen
e2462c0cc3 Merge "Issue #947 fix parsing of DataTime. Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04" into development_on_ss_builds 
Former-commit-id: 8cd83e1571 [formerly a88d7bcedc] [formerly fbbf74eb50 [formerly b7cac9d262bd99e74a51d903042fb7ad79eddfa8]]
Former-commit-id: fbbf74eb50
Former-commit-id: 1214c05b72
 2012-08-08 16:10:13 -05:00
Ben Steffensmeier
8cdf1f8d1c Issue #947 fix parsing of DataTime. 
Change-Id: Ie49c287850a3e12a748e43aafa0f1a90bce13b04

Former-commit-id: cac790ac5a [formerly 97ba96759c] [formerly 5da238c8b9 [formerly 30ebbadbbffce0c3b1a236d36be5f3013124e7cd]]
Former-commit-id: 5da238c8b9
Former-commit-id: b6cc71bf75
 2012-08-08 14:41:33 -05:00
Steve Harris
2b43860c67 Merge branch 'development_on_ss_builds' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development_on_ss_builds 
Former-commit-id: 24515a43b6 [formerly 1feb52683a] [formerly a9b587019a [formerly e49333c9cddc47d2b8f3f835e19657043d51a7af]]
Former-commit-id: a9b587019a
Former-commit-id: 805972e2fd
 2012-08-08 13:59:52 -05:00
Steve Harris
352f391700 Fixed merge (take 3) of development / 12.8.1-5 versions of HttpClient.java 
Former-commit-id: fc39ef78e4 [formerly bbf4b18204] [formerly d538fd8913 [formerly d8080798d6c69b9cf0f9042660c5ad910cf123c6]]
Former-commit-id: d538fd8913
Former-commit-id: 0ef9f1c86e
 2012-08-08 13:57:46 -05:00
Nate Jensen
197fbde870 Merge "Issue #1004 make dispose/shutdown of plot jobs more permenant by joining." into development_on_ss_builds 
Former-commit-id: a241db9e69 [formerly b704e8d3f4] [formerly 6c758b7c84 [formerly 65ea6e46e059a058d5a46b0cf28f1b50c3057744]]
Former-commit-id: 6c758b7c84
Former-commit-id: 81bba55a1e
 2012-08-08 09:43:40 -05:00
Steve Harris
d42beafc73 Fixed merge (take 2) of development / 12.8.1-5 versions of HttpClient.java 
Former-commit-id: e2267aa186 [formerly 926ff5dc5a] [formerly 9e2e0fa166 [formerly 5717f9bf344b6d78ca30f1387679e535bac5a13c]]
Former-commit-id: 9e2e0fa166
Former-commit-id: 15753699bd
 2012-08-07 15:29:25 -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
Ben Steffensmeier
f47d533ac3 Issue #1004 make dispose/shutdown of plot jobs more permenant by joining. 
Former-commit-id: 0a974b26c2 [formerly c9774a4f03] [formerly 83d6cde368 [formerly 4c5e5e0d54c523723edd16b756dc1caf208f5cd6]]
Former-commit-id: 83d6cde368
Former-commit-id: ea70488664
 2012-08-07 12:03:13 -05:00
Steve Harris
a810a273a2 Fixed merge of development / 12.8.1-5 versions of HttpClient.java 
Former-commit-id: 6615c96f33 [formerly 6dae0398d3] [formerly 3f88fa9078 [formerly 34a733bb4701c6f083595be42e5b15cd4ba868bd]]
Former-commit-id: 3f88fa9078
Former-commit-id: 9387e8b2d0
 2012-08-07 10:04:39 -05:00
Steve Harris
5e30a4282c Merge branch 'development' into development_on_ss_builds 
Former-commit-id: f540dbfb87 [formerly 32ee17d124] [formerly 515c8ec596 [formerly 69faa80856ac4c63f9cc79ccd7370e129093f091]]
Former-commit-id: 515c8ec596
Former-commit-id: 533d58b312
 2012-08-06 12:57:56 -05:00
Steve Harris
2f3ef9f4da Merge branch '21.2-Warngen_Urban_Boundaries' into development_on_ss_builds 
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java

Former-commit-id: 60c0cfc3b3 [formerly d90c5f989d] [formerly f3babcf1a1 [formerly 2a2487546a533987bc618b06780bba4d0bc61da8]]
Former-commit-id: f3babcf1a1
Former-commit-id: 62e9207ba7
 2012-08-06 11:13:47 -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
Steve Harris
52e0da2293 Merge branch 'ss_builds' (12.8.1-10) into development_on_ss_builds 
Conflicts:
	rpms/awips2.64/Installer.h5py/component.spec

Former-commit-id: 9e2d161f8d [formerly f0b7d5e4c5] [formerly 85f82b18b3 [formerly f6fc0581c3100ef186b90668cb1f1ae4283eaa7b]]
Former-commit-id: 85f82b18b3
Former-commit-id: b2432e096f
 2012-08-06 09:38:26 -05:00
Steve Harris
78d34d65d2 12.8.1-10 baseline 
Former-commit-id: 6244359a80 [formerly b5e8fee24d] [formerly ca25d508ec [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]
Former-commit-id: ca25d508ec
Former-commit-id: d5563fc340
 2012-08-06 09:34:26 -05:00
Jonathan Sanchez
1af2520b91 Issue #1006 Implemented urban areas. 
Former-commit-id: 06ce1c6dd5 [formerly dbd30e3b67] [formerly 62db15b6f4 [formerly 8f7bbb2509278237184cbcee81ff1cc6eb61aa72]]
Former-commit-id: 62db15b6f4
Former-commit-id: f26cce33a9
 2012-08-06 08:41:52 -05:00
Steve Harris
dbe07ca70c Merge branch 'development' into development_on_ss_builds 
Former-commit-id: 54c505dd8e [formerly 24799cd93d] [formerly a1071e3204 [formerly fa3dac43f4e945514906fb7844f10fb3782bcead]]
Former-commit-id: a1071e3204
Former-commit-id: 8f4ddad22c
 2012-08-06 08:23:04 -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
Steve Harris
d2291ba23f Merge branch 'ss_builds' (12.8.1-5) into development_on_ss_builds 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/AbstractParmManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/parm/vcparm/VCModuleJobPool.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/colorbar/GFEColorbarResource.java
	edexOsgi/com.raytheon.uf.common.cache/src/com/raytheon/uf/common/cache/DiskCache.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
	rpms/awips2.64/Installer.h5py/component.spec
	rpms/awips2.64/Installer.python/component.spec
	rpms/awips2.64/Installer.python/src/lapack.patch1
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
	rpms/python.site-packages/Installer.pupynere/component.spec

Former-commit-id: fb47934159 [formerly 6d77b94217] [formerly 51e38ca887 [formerly 1b17cebeb85f871d950bd02e27141b11d977c3ad]]
Former-commit-id: 51e38ca887
Former-commit-id: 3476fe755b
 2012-08-01 12:43:12 -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
Steve Harris
dab00b12e6 12.8.1-5 baseline 
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: cd49ef3eda
Former-commit-id: e0c3722fd1
 2012-08-01 10:45:37 -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