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

227 commits

Author SHA1 Message Date
Max Schenkelberg
cb1d5d1c5b Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base 
Change-Id: I2a26ce21ca5127ddb0b32e1f645a544e83f5503f

Former-commit-id: d79cfe8ad1 [formerly 0f3c791120 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]
Former-commit-id: 0f3c791120
Former-commit-id: b95a96f4c9
 2013-08-09 14:24:49 -05:00
Nate Jensen
3b787e12df Issue #2142 remove more dependencies on edex.common 
Change-Id: Iac9d21fc531c03920fcbb52d6a9cc833a2625a2f

Former-commit-id: a9f5465c99 [formerly a919490d00 [formerly f650a26ee4c6c944164d2b5d917b5f8b6ad32bb5]]
Former-commit-id: a919490d00
Former-commit-id: cce952c0bc
 2013-08-08 14:46:52 -05:00
Nate Jensen
6d7d504f20 Issue #2210 moved base cave_static colormaps to common_static and updated code 
deleted duplicate edex_static colormaps
            wrote delta script for site/user cave_static colormaps to move to common_static

Change-Id: I53c86d0974706023608e1ec5e10f34619aafb8de

Former-commit-id: 27dd27a73f [formerly a1a9a4751a [formerly 4383d88a37c9ae9298f7ea9081d87d6ded34de66]]
Former-commit-id: a1a9a4751a
Former-commit-id: 960dc1e81e
 2013-08-06 17:17:53 -05:00
Nate Jensen
4285a532f2 Issue #2228 use TMemoryInputTransport for slight efficiency improvement 
Change-Id: I280dacdd48f5e092b312a80916db6202a1138ebf

Former-commit-id: 842f15ae12 [formerly d4590cbf5e [formerly 3f3afa1fe36da04ce47b9af1e8bd34746b75e68f]]
Former-commit-id: d4590cbf5e
Former-commit-id: 963119e0f3
 2013-08-06 09:52:02 -05:00
Max Schenkelberg
7d88c2a719 Issue #2190 Refactored Popup SkewT and cloud height sampling to create clearer separation of functionality and implemented NUCAPS sounding source. 
Amend: Fixed println, added uncustomization of displays to interface, fixed font issue
Amend: Fixed comments and switched to TimeUtil for common constants for time

Change-Id: I92b49a59848ee4a8f61205ab21f5de2e0c260525

Former-commit-id: f08e2d5edc [formerly 474429aaee [formerly 00aaabcbe2b7a66c63de3196cc68f57ccb4664a5]]
Former-commit-id: 474429aaee
Former-commit-id: 54fe14b06b
 2013-08-05 16:46:02 -05:00
Richard Peter
e439ecafe6 Merge branch 'omaha_13.5.1' (13.5.1-8) into development 
Conflicts:
	RadarServer/build.rcm/build.xml
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarMLResource.java

Former-commit-id: f97a27796d [formerly 26df62db53 [formerly d72693a1db1cd55392c7d171a67918e2bbe5daed]]
Former-commit-id: 26df62db53
Former-commit-id: 464352f731
 2013-07-31 12:54:12 -05:00
Ron Anderson
a5b4564bf4 Merge "Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay." into development 
Former-commit-id: 43b5d2193b [formerly ca94d4ffac [formerly b286c654293e9b7bc11930953118b1d86da946dc]]
Former-commit-id: ca94d4ffac
Former-commit-id: d569641f3e
 2013-07-30 08:35:06 -05:00
Ron Anderson
7cbf6290b7 Issue #2140 Added getSafeName to abstractVizResource and a standardized resource painting method to AbstractRenderableDisplay. 
Change-Id: I3d2541a057440a3813837a91bef4e86172d73e4c

Former-commit-id: 4aceedceb5 [formerly ebdfbebcfc [formerly 0f490c934d197bc45fea1fad2c034c47a2556988]]
Former-commit-id: ebdfbebcfc
Former-commit-id: a5da46c360
 2013-07-29 18:12:24 -05:00
Richard Peter
a3d9294d13 Issue #2170: Initial plugin rename for notification framework 
Change-Id: I3414d802e419433dcd6918422a12ce7105ae8b13

Former-commit-id: 8ba840f1d9 [formerly 359ee5d1af [formerly 8a8eff74685abb8a709480fa33f2c56dd7923ab9]]
Former-commit-id: 359ee5d1af
Former-commit-id: bf99d8fd4d
 2013-07-26 14:36:46 -05:00
Greg Armendariz
3655c16d39 Issue #2207 - fix build issues with ncep unit-test directories 
Former-commit-id: 17b8376a72 [formerly db65f0c206 [formerly 766c2983afc0aac22143f86afa0c5eca500d1941]]
Former-commit-id: db65f0c206
Former-commit-id: 777fe464d0
 2013-07-26 09:48:44 -05:00
Steve Harris
52da6c54db 13.5.1-8 baseline 
Former-commit-id: dfbf9a5afe [formerly 3bece5e5d0 [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]]
Former-commit-id: 3bece5e5d0
Former-commit-id: 392faf86e7
 2013-07-26 09:02:34 -04:00
Nate Jensen
37b332864d Issue #2208 move remainder of unit-tests to tests project, disable building ones dependent on eclipse/swt, ignore ones that are failing 
Change-Id: I49467fe6e9425a73985f729bc1ea4b10eb139c16

Former-commit-id: d364cfe32e [formerly cf656dddc6 [formerly a53ff5142d15461a595adb8a6e8d6b96aee3a878]]
Former-commit-id: cf656dddc6
Former-commit-id: 25b78917ff
 2013-07-25 14:59:01 -05:00
Nate Jensen
cf4dce1b2d Issue #2208 moving ncep unit tests to tests project 
Change-Id: I723edf8936970d57108796ca1bc775b93e5e2507

Former-commit-id: d7be59a97e [formerly 838554cf98 [formerly b027914534dc808a616e2b5b2ee55ed3dd304b2e]]
Former-commit-id: 838554cf98
Former-commit-id: 38fa2ca855
 2013-07-25 13:28:27 -05:00
Nate Jensen
8707633263 Issue #2215 upgrade thrift to version 0.9.0 
Change-Id: I9cf910a75c25f1d97a711a9088c3b496ceb2be70

Former-commit-id: 8898a6d2ba [formerly 7b4938a999 [formerly ab2e3f3e8910043b117887712258fc689f2e9445]]
Former-commit-id: 7b4938a999
Former-commit-id: 7197e75c15
 2013-07-23 12:28:07 -05:00
Richard Peter
fc28bf67bb Issue #1977: Fix NCEP Plugin issues due to merge 
Former-commit-id: 00aeeb338b [formerly fa6a457cd0 [formerly 7c054e201e41d4df5fdb82faf2648e3f8cd227cc]]
Former-commit-id: fa6a457cd0
Former-commit-id: 3879c810db
 2013-07-22 16:37:43 -05:00
Nate Jensen
96afcbfa72 Issue #2142 fix ncep features 
Change-Id: I3d13c58e450d7b0b41f41f608986537b51c3b4ca

Former-commit-id: 07dfc5d206 [formerly 747cab2eaf [formerly 3b35fd54816e3a8926e4061a4e36ca6be7287dd3]]
Former-commit-id: 747cab2eaf
Former-commit-id: 412c880579
 2013-07-22 14:17:17 -05:00
Richard Peter
19dacc32c1 Merge branch 'omaha_13.5.1' (13.5.1-7) into development 
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/subset/GriddedSubsetManagerDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesAction.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
	cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
	edexOsgi/com.raytheon.uf.common.pointdata/src/com/raytheon/uf/common/pointdata/spatial/SurfaceObsLocation.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	ncep/gov.noaa.nws.ncep.viz.customProjection/META-INF/MANIFEST.MF
	rpms/awips2.cave/deploy.builder/build.sh

Former-commit-id: c6386e306f [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]
Former-commit-id: 15d1a6eab0
Former-commit-id: 401ed88e44
 2013-07-22 09:40:18 -05:00
Ben Steffensmeier
095f200bd9 Issue #1992 Remove redundant time columns from bufrua. 
Change-Id: If0799726ff9fa3d90026d0115cc03bd55347ce90

Former-commit-id: 9c55581ad2 [formerly ad0cefc7fa [formerly 3e916aad7d281ba53cd1634a15d7ac521943bc75]]
Former-commit-id: ad0cefc7fa
Former-commit-id: e11099ff24
 2013-07-19 11:53:23 -05:00
Steve Harris
67299457b1 13.5.1-7 baseline 
Former-commit-id: 86ce1248c2 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]
Former-commit-id: bf58a81b38
Former-commit-id: 630705aa3f
 2013-07-18 12:07:22 -04:00
Nate Jensen
87bfe94322 Issue #2032 move build.edex's common-static files to appropriate plugins 
Change-Id: I15fa37459c34dd40b253a97b99d62c5fc8ff4d15

Former-commit-id: b767760a9c [formerly 5264d3a5b8 [formerly e2feb9de0c2d7e1d7fb5dac1b0878aabe79f9ab2]]
Former-commit-id: 5264d3a5b8
Former-commit-id: 188d76ea71
 2013-07-18 09:53:53 -05:00
Ben Steffensmeier
117412c096 Issue #2181 Convert geometry types to use hibernate-spatial 
Former-commit-id: 0bc5aca64b [formerly a655380bad [formerly ded324e06f81fc63e6567a535cfa8a843a39902d]]
Former-commit-id: a655380bad
Former-commit-id: e8b22db364
 2013-07-16 15:50:14 -05:00
Max Schenkelberg
cd88054e2b Issue #2142 Got log4j out of edex. 
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]
Former-commit-id: 63421a4819
Former-commit-id: 94fa6f0e30
 2013-07-15 14:26:15 -05:00
Greg Armendariz
e375a74bc8 13.5.1-6 baseline 
Former-commit-id: b9044b1195 [formerly 7e09fa5a0b [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]]
Former-commit-id: 7e09fa5a0b
Former-commit-id: 5894853996
 2013-07-10 10:04:22 -04:00
Greg Armendariz
ed9da994c7 13.5.1-5 baseline 
Former-commit-id: ea7ac37930 [formerly 492f92ef7b [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]]
Former-commit-id: 492f92ef7b
Former-commit-id: 82aabf1066
 2013-07-03 12:20:27 -04:00
Steve Harris
2487a8b435 13.5.1-4 baseline 
Former-commit-id: e197f23ce3 [formerly 70e4ff30a6 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]]
Former-commit-id: 70e4ff30a6
Former-commit-id: c56be8a332
 2013-06-28 09:46:25 -04:00
Ben Steffensmeier
9e23a71d84 Issue #1869 Fix plot sampling. 
Change-Id: I4c2087057a939d3a148f1635b999fe53b735258b

Former-commit-id: 6db28c32a5 [formerly 8c14a34f46 [formerly 42b779a7695635414764b3c491ba24c0d70983b5]]
Former-commit-id: 8c14a34f46
Former-commit-id: 570da6f0d5
 2013-06-26 13:24:13 -05:00
Richard Peter
f47f42e31e Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	rpms/build/i386/build.sh

Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24

Former-commit-id: 37645245e5 [formerly 744eb64856 [formerly 24e3c900db35375045d2ec581772d0f3a7bf541c]]
Former-commit-id: 744eb64856
Former-commit-id: 0fa3bf800d
 2013-06-24 18:36:15 -05:00
Steve Harris
a0ff6c20ea 13.5.1-3 baseline 
Former-commit-id: 72d22a30c9 [formerly 63803c1424 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]]
Former-commit-id: 63803c1424
Former-commit-id: d8176d4a4c
 2013-06-24 09:29:43 -04:00
Nate Jensen
5eef22fd4d Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml 
Change-Id: I58f5081a0c4e55b1b4d47f2d9eecdea6152c86e6

Former-commit-id: c4283b0336 [formerly 81fc4fa753 [formerly 65a84967aa3afcef1f287fb769fd80f9dbf25349]]
Former-commit-id: 81fc4fa753
Former-commit-id: c0f95eb55a
 2013-06-19 10:16:06 -05:00
Steve Harris
7fe15db2f8 13.5.1-2 baseline 
Former-commit-id: 3386330894 [formerly adb779323d [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]]
Former-commit-id: adb779323d
Former-commit-id: bc60b22f00
 2013-06-17 15:01:22 -04:00
Steve Harris
5d99df9969 13.5.1-1 baseline 
Former-commit-id: fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]
Former-commit-id: 998961612c
Former-commit-id: 6384018950
 2013-06-10 15:17:17 -04:00
Bryan Kowal
85e8a629cb Issue #1927 - webapps will now self-identify themselves 
Former-commit-id: 5056e2a0fa [formerly 9bd2741e22 [formerly 67787a77b4211ff74d34be7e33d26fa439cc9492]]
Former-commit-id: 9bd2741e22
Former-commit-id: 1a083a2cfc
 2013-06-07 13:47:20 -05:00
Steve Harris
a150d8b90b Merge branch 'omaha_13.4.1' into development 
Conflicts:
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/datacatalog/PointDataCatalog.java

Former-commit-id: 2327205cb7 [formerly 571757b2a6 [formerly 43499d1a76f65804a5e74894cad3186765de3501]]
Former-commit-id: 571757b2a6
Former-commit-id: 64cf1aedb1
 2013-06-06 15:46:23 -05:00
Steve Harris
ffcce90f3f 13.4.1-14 baseline 
Former-commit-id: 18b90226a2 [formerly c749e122eb [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]]
Former-commit-id: c749e122eb
Former-commit-id: be236eb722
 2013-06-06 15:15:27 -04:00
Nate Jensen
00fbfbe7e5 Issue #1989 remove unused schemas 
Change-Id: Ia040164481647fc384a264cd2126b8f9438df594

Former-commit-id: fc691cbb2f [formerly f3258e77f7 [formerly b0ad25ccd9e20b6bf994a3a46ce38298c363adff]]
Former-commit-id: f3258e77f7
Former-commit-id: 740237c317
 2013-05-29 16:19:28 -05:00
Nate Jensen
04d6f6654d Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh 
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 3f3e0a788d [formerly 99b4a21414 [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]
Former-commit-id: 99b4a21414
Former-commit-id: 927da5cffb
 2013-05-29 14:49:43 -05:00
Nate Jensen
cf705759bd Issue #1989 remove wrapper.conf properties that are just passthroughs from env variables 
Change-Id: I1d922e836a22828985c65be646c5f39fa0d7d16c

Former-commit-id: 36bc35b5c8 [formerly 82d6c03669 [formerly 281edabb772b68e80bf6a9456f3a8e19576ed7da]]
Former-commit-id: 82d6c03669
Former-commit-id: 808ab352c5
 2013-05-29 09:20:53 -05:00
Nate Jensen
e8ebe1a123 Issue #1989 remove activemq references from spring xml, fix deprecated javadoc 
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: 1fd2f8965f [formerly 1978133177 [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]
Former-commit-id: 1978133177
Former-commit-id: b7cecb931e
 2013-05-23 11:20:40 -05:00
Nate Jensen
4ae00040e3 Issue #1989 use camel's built-in DirectVm component 
Change-Id: I61d2c5026e5bb75f8a80fc99a199336aa93a4b31

Former-commit-id: d7b8e04bb7 [formerly d74936ef3e [formerly 90397159ef98097da0754a846d1f67d4839a300d]]
Former-commit-id: d74936ef3e
Former-commit-id: 65b9bafed7
 2013-05-23 10:06:28 -05:00
Steve Harris
511f938c3f Merge branch 'omaha_13.4.1' into development 
Former-commit-id: 3590310f17 [formerly 8496832064 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]
Former-commit-id: 8496832064
Former-commit-id: 570128b986
 2013-05-22 16:13:08 -05:00
Steve Harris
623f813923 13.4.1-12 baseline 
Former-commit-id: e53ada66b8 [formerly 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]
Former-commit-id: 6a97b4325a
Former-commit-id: 397bbf674a
 2013-05-22 16:42:39 -04:00
Richard Peter
8fac7f2fd9 Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development 
Former-commit-id: b4344d3c04 [formerly c9c1570960 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]
Former-commit-id: c9c1570960
Former-commit-id: 62c8176486
 2013-05-21 13:07:51 -05:00
Richard Peter
efd545925e Merge branch 'omaha_13.4.1' (13.4.1-11) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: 930ff50fb8 [formerly 8aa4b0025c [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]
Former-commit-id: 8aa4b0025c
Former-commit-id: 3d84e1dd53
 2013-05-21 12:11:21 -05:00
Ben Steffensmeier
5219bd8426 Issue #1869 Rewrite dataURI property mappings. 
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9

Former-commit-id: 931e76ae59 [formerly 1a31aa2211 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]
Former-commit-id: 1a31aa2211
Former-commit-id: c11631c7da
 2013-05-20 18:00:32 -05:00
Steve Harris
294c127b0a 13.4.1-10 baseline 
Former-commit-id: 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]
Former-commit-id: 9a403b3615
Former-commit-id: 68fe2134b8
 2013-05-20 10:52:47 -04:00
Nate Jensen
c5e226e268 Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages 
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: 6f1684b85c [formerly 08b9ce4c62 [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]
Former-commit-id: 08b9ce4c62
Former-commit-id: 1fcbeb41c9
 2013-05-14 16:16:13 -05:00
Steve Harris
02dba50c00 13.4.1-8 baseline 
Former-commit-id: c59b52a266 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]
Former-commit-id: 19866e7032
Former-commit-id: 576a74fe0b
 2013-05-14 09:21:41 -04:00
Richard Peter
207c17d5af Merge branch 'omaha_13.4.1' (13.4.1-7) into development 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ui/layer/VRShearLayer.java
	cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/interrogators/RadarVelocityInterrogator.java
	edexOsgi/build.edex/esb/conf/spring/edex.xml
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/db/purge/SchemaManager.java
	edexOsgi/com.raytheon.uf.edex.purgesrv/src/com/raytheon/uf/edex/purgesrv/PurgeJob.java

Change-Id: Ie7062275be13d6b19bbc9476b0c0f5aba129c862

Former-commit-id: c5040038d3 [formerly a12830f762 [formerly 3f82f4d18bd7d0afa1e4cb49493e690d9160c24e]]
Former-commit-id: a12830f762
Former-commit-id: 2c009eb618
 2013-05-13 17:11:05 -05:00
Ben Steffensmeier
7c91a83521 Issue #1869 Remove dataURI column from PluginDataObject. 
Change-Id: I3450130d8e68c065683794ba941a83897fe36745

Former-commit-id: 79015595ee [formerly 4209e014d8 [formerly 7fd2829cd730562a549a2f3c423ac5ead15872e7]]
Former-commit-id: 4209e014d8
Former-commit-id: dab2af2df5
 2013-05-08 18:39:25 -05:00
Ben Steffensmeier
c653b26b26 Issue #1847 Allow painting with no Wind Data. 
Change-Id: I01ff02602d46702395b3443567f0b82adab6d59c

Former-commit-id: 7b96ccbf0e [formerly 52845da6a8 [formerly c4eec589218d1c1265fd596646abd9dc2322fd74]]
Former-commit-id: 52845da6a8
Former-commit-id: dcf4c3cb6e
 2013-05-08 12:34:46 -05:00