Commit graph

2055 commits

Author SHA1 Message Date
Nate Jensen
2e5b04450e Issue #2207 removing custom org.junit
Change-Id: I6b65719c0b48a3430b9318aa6dbbf4718f98df7b

Former-commit-id: 185296c67d [formerly 185296c67d [formerly ae869b69c5a648205d4d0cd7275b4a6c1e82054d]]
Former-commit-id: 4ccfc5be82
Former-commit-id: a3fd5fa3ee
2013-07-25 16:48:18 -05:00
Nate Jensen
1cc5422213 Merge "Issue #2208 move remainder of unit-tests to tests project, disable building ones dependent on eclipse/swt, ignore ones that are failing" into development
Former-commit-id: b7c4087765 [formerly b7c4087765 [formerly 6db335a5fda51c1d501e7a5d6b1fc58eba77160a]]
Former-commit-id: 88c0b989ef
Former-commit-id: a7cadf0388
2013-07-25 16:04:22 -05:00
Nate Jensen
070fa38093 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: cf656dddc6 [formerly cf656dddc6 [formerly a53ff5142d15461a595adb8a6e8d6b96aee3a878]]
Former-commit-id: d364cfe32e
Former-commit-id: dc7c2fd063
2013-07-25 14:59:01 -05:00
Ron Anderson
68de87a472 Merge "Issue #2044 Refactor of GFE Server code" into development
Former-commit-id: 604cfd2070 [formerly 604cfd2070 [formerly 3720bf498346073343d0dff7a6949d3f7f0d5f62]]
Former-commit-id: 0428b8fb7b
Former-commit-id: b084626454
2013-07-25 13:59:17 -05:00
Richard Peter
5f54d104a2 Merge "Issue #2176 Implemented emergency warning products." into development
Former-commit-id: 5d192e263f [formerly 5d192e263f [formerly 717a1f81ecc323e4e1cc10e923956befb99e3e04]]
Former-commit-id: 89823b3681
Former-commit-id: d98c33cfbc
2013-07-25 13:54:48 -05:00
Jonathan Sanchez
869fbdc7fc Issue #2176 Implemented emergency warning products.
Change-Id: Icde169adbcfc5c409319649d63d222044a35dae2

Former-commit-id: 7d74ba5ee1 [formerly 7d74ba5ee1 [formerly 36df6339cc00afc5935746a4a47b0e9e8c641f85]]
Former-commit-id: 67ce90c14a
Former-commit-id: 4b38e3786d
2013-07-25 13:47:44 -05:00
Nate Jensen
17d5768f7b Merge "Issue #2199 Fixed subgridding calculation and made so data smoothing is done once instead of every paint" into development
Former-commit-id: d5158a3fd5 [formerly d5158a3fd5 [formerly 3d3e29b59fdac2e97d9783e1b102fe3227c4197d]]
Former-commit-id: 4f8cf1230f
Former-commit-id: 65dc8671f7
2013-07-25 13:22:37 -05:00
Max Schenkelberg
b557b5d141 Issue #2199 Fixed subgridding calculation and made so data smoothing is done once instead of every paint
Amend: Added comments

Change-Id: Ieb045b1a8f8271adba804cacd6f47996ffae4cf5

Former-commit-id: d3df3e97c8 [formerly d3df3e97c8 [formerly 2cc61515015e125816b76c560900744258dbd2f1]]
Former-commit-id: 3506c5d38d
Former-commit-id: dafbad884d
2013-07-25 13:18:46 -05:00
Ron Anderson
7c0b176b9d Issue #2044 Refactor of GFE Server code
Change-Id: I2c6dde3ba9646f6b36a3f74657dc0d21cbcf3f35

Former-commit-id: cfa2d38a32 [formerly cfa2d38a32 [formerly 03c62b606659be0cf81c8401a1c52c5fe5c52b1b]]
Former-commit-id: a915cdab25
Former-commit-id: 46d47d61e7
2013-07-25 13:05:56 -05:00
Nate Jensen
cf26f59d5f Merge "Issue #2203 synchronize init and dispose of frames" into development
Former-commit-id: 9ad16f084a [formerly 9ad16f084a [formerly dff57efeb2c54cffc5caf61a50bf954cc39bdc37]]
Former-commit-id: 1bb0208372
Former-commit-id: 294a8d0d38
2013-07-25 10:02:42 -05:00
Mike Duff
1eb1718b19 Issue #2218 - improve error handling and performance in SCANMonitor
Change-Id: I0b65dcb372c69ad736b3a550392299507dbcedeb

Former-commit-id: e23aaedada [formerly e23aaedada [formerly cff253a5eb779a2f5e156d5802dc9bb8afc2e7e0]]
Former-commit-id: 4034146e23
Former-commit-id: 075cd28b9c
2013-07-25 08:35:30 -05:00
Nate Jensen
90866d6c06 Merge "Issue #2189 Added a FontType option when initializing a font from a file." into development
Former-commit-id: c8d7c9cdf9 [formerly c8d7c9cdf9 [formerly a17330cc596961b4b3630579631de438f971c884]]
Former-commit-id: 7b1d8cb576
Former-commit-id: 29e7454a4f
2013-07-24 17:01:06 -05:00
Max Schenkelberg
2efabffe80 Issue #2189 Added a FontType option when initializing a font from a file.
Amend: Added abstract awt font class, deprecated initializeFont not specifying FontType, added comments

Change-Id: Ia5608cb7ffd0b760b3922e65107e66c971fa3e63

Former-commit-id: c386533867 [formerly c386533867 [formerly 9250700e425983156dd2d226556647d6a2bf43af]]
Former-commit-id: 3381c0016e
Former-commit-id: a8972da606
2013-07-24 16:35:50 -05:00
Nate Jensen
a6943514a7 Issue #2203 synchronize init and dispose of frames
Change-Id: I94504a039f321ff40830b3bb7e21d31bf586a0d0

Former-commit-id: b053fea59b [formerly b053fea59b [formerly ed75a28d871dc1e97717fa44636df635eed8b4fc]]
Former-commit-id: 162a1ba48f
Former-commit-id: ac310f7bbf
2013-07-24 16:17:43 -05:00
Mike Duff
31ec8c5118 Issue #2217 - Added better error handling
Change-Id: Ia15b57fbee9e3cecb93ac711ca3d99529df3ac00

Former-commit-id: 8ac8e405ec [formerly 8ac8e405ec [formerly b7a602066d1c01a9b6399d2dade3ed3dd487103e]]
Former-commit-id: e584ddbf45
Former-commit-id: f98a232c8b
2013-07-24 13:54:33 -05:00
Nate Jensen
f6d5014c43 Issue #2223 fix melting layer memory leak
Change-Id: I2fbf4dbaea12e4bba560b27ba372df0c3f913fec

Former-commit-id: 88b2dd18e6 [formerly 88b2dd18e6 [formerly 3909f42ee097dac541328f8dc85330c618583b3f]]
Former-commit-id: 7b5dcc09fa
Former-commit-id: 8db7b7b5f6
2013-07-23 14:27:29 -05:00
Nate Jensen
fa24302a76 Issue #2215 upgrade thrift to version 0.9.0
Change-Id: I9cf910a75c25f1d97a711a9088c3b496ceb2be70

Former-commit-id: 7b4938a999 [formerly 7b4938a999 [formerly ab2e3f3e8910043b117887712258fc689f2e9445]]
Former-commit-id: 8898a6d2ba
Former-commit-id: 375ad89ac8
2013-07-23 12:28:07 -05:00
David Gillingham
6b49330d25 Issue #1842: Fix issue where start time of in progress VTEC events was being set
to 991130T0000Z.


Former-commit-id: cf21fb8fb3 [formerly cf21fb8fb3 [formerly e6ad90e07a4af553edcb79ce71790f339b3f4ed5]]
Former-commit-id: 2281f4abc5
Former-commit-id: ea42ffa3e5
2013-07-22 16:37:42 -05:00
Nate Jensen
c28a52bee8 Issue #2142 removing some viz dependencies on edex.common
Change-Id: I11e42f76c4b58292535af03ddf25023fbdeb734c

Former-commit-id: 22438766b4 [formerly 22438766b4 [formerly 399d44a62df1c54e94d93d4e0b198db976104143]]
Former-commit-id: 4c9cc211ec
Former-commit-id: 797760bb71
2013-07-22 12:20:43 -05:00
Ron Anderson
8bff2be5dc Merge "Issue #2185 Cache computed grid reprojections." into development
Former-commit-id: ecce97701f [formerly ecce97701f [formerly 4f75c44b4dccb1cde093e32605dae809aa7a351c]]
Former-commit-id: cd639e0220
Former-commit-id: 61e947ba76
2013-07-22 11:43:48 -05:00
Richard Peter
85fc9c773b 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: 15d1a6eab0 [formerly 15d1a6eab0 [formerly 293586df88f53c2ddf6f7586bf71719298728022]]
Former-commit-id: c6386e306f
Former-commit-id: 12993d9539
2013-07-22 09:40:18 -05:00
Richard Peter
7fc81195f0 Merge "Issue #1655 - Implement the framework for DD system status messaging" into development
Former-commit-id: 51a097fb8d [formerly 51a097fb8d [formerly 638b708123bb5a89292cc7778ed8211102718d28]]
Former-commit-id: 7ceaed43c3
Former-commit-id: 5026801885
2013-07-21 22:54:14 -05:00
Richard Peter
64adb6ec6c Merge "Issue #1653 - Add a subscription summary" into development
Former-commit-id: 73c2547981 [formerly 73c2547981 [formerly 74351187e3b7061ecfdfd040ff88b81823055889]]
Former-commit-id: 68e565fdd9
Former-commit-id: 992b544e33
2013-07-21 22:04:02 -05:00
Greg Armendariz
e1092b5725 Merge "Issue #2205 Fix cancelling adhoc queries" into omaha_13.5.1
Former-commit-id: a3b77f2623 [formerly a3b77f2623 [formerly d60e75576a5f80f8838330789c97e89788c7a057]]
Former-commit-id: d5ea12d97f
Former-commit-id: 3947baa02d
2013-07-19 14:15:24 -05:00
Richard Peter
3a573f4256 Merge branch 'master_13.5.1' (13.5.1-7) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/AbstractArchiveDlg.java
	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/rsc/FFMPDataGenerator.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.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/thread/AbstractLoadJob.java
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPDataContainer.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTIProcessor.java
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: 7e08c04383 [formerly 7e08c04383 [formerly 3a10af4a3aedbccccb2062f5bf6c0902e448e6d7]]
Former-commit-id: cc7189fcb7
Former-commit-id: ea2b372343
2013-07-18 21:46:25 -05:00
Mike Duff
00904dc8ec Issue #1653 - Add a subscription summary
Change-Id: I677ae6d472a4de5bd8905650b2e13ffc1e2af149

Former-commit-id: 823f064ef8 [formerly 823f064ef8 [formerly d64a7895e08df47feedfb95edec033d0c87384c1]]
Former-commit-id: d5ef7f056f
Former-commit-id: b4c9a0066a
2013-07-18 14:53:10 -05:00
Steve Harris
eff4fb29dd 13.5.1-7 baseline
Former-commit-id: bf58a81b38 [formerly bf58a81b38 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]]
Former-commit-id: 86ce1248c2
Former-commit-id: f9c9aecba5
2013-07-18 12:07:22 -04:00
Dustin Johnson
865d1d88fc Issue #2205 Fix cancelling adhoc queries
Change-Id: I81207fe9c68a111e9894a7a25b83d9f0b4c03317

Former-commit-id: 58ab4e5cfc [formerly 58ab4e5cfc [formerly dd05e6c8f9c17ac331b137b9eb3d486c459144fb]]
Former-commit-id: 9aadc61ea5
Former-commit-id: 54ff2b87c6
2013-07-18 11:06:42 -05:00
Roger Ferrel
47ac9a9147 Issue #1966 Relocation of configuration files and checks for bad configuration files.
Change-Id: I1e26806cfc27eb25d0f3b8c1ad6ed21bfaebfc9c

Former-commit-id: c002045a87 [formerly c002045a87 [formerly d8b89bcf2bb65e3e54730e58ab7529f03fcbbaad]]
Former-commit-id: 91ee1d36bf
Former-commit-id: 95cb3439a4
2013-07-18 10:02:05 -05:00
Ben Steffensmeier
e6e2a2d619 Issue #2185 Cache computed grid reprojections.
Former-commit-id: b5542309b3 [formerly b5542309b3 [formerly 891f2241dd238b2901f8c1daee8f2236558f42e0]]
Former-commit-id: ae8110acf6
Former-commit-id: 6febd20a1c
2013-07-17 17:34:34 -05:00
Nate Jensen
d3526cc878 Merge "Issue #2156 added orphan checking to time match basis on time match and set to null if not on any descriptor" into development
Former-commit-id: 12a9907775 [formerly 12a9907775 [formerly ae5a73adff9925796610ccdda83459a2f7ffb771]]
Former-commit-id: 08a90aa293
Former-commit-id: 41fb919028
2013-07-17 17:10:32 -05:00
Nate Jensen
655050e317 Merge "Issue #2158 Allow VizGlobalsManager to work without accessing UI thread. Change-Id: I3cb8e97d68a76b371a93a52b1c4f7b860b0847c1" into development
Former-commit-id: b42b2f12ec [formerly b42b2f12ec [formerly 91357f42f9762e47984cba6fcf5479deb1fd5724]]
Former-commit-id: 3c2cd76715
Former-commit-id: bd489239a9
2013-07-17 17:09:29 -05:00
Nate Jensen
c6c8c3c2d0 Merge "Issue #2184 Removed all other HUCs other than ALL from storage" into omaha_13.5.1
Former-commit-id: 09cae0cba3 [formerly 09cae0cba3 [formerly 7f9e83b42df42c1bec7946833e88a8916fc0c12d]]
Former-commit-id: 3649af1b71
Former-commit-id: cb9b26a380
2013-07-17 16:34:25 -05:00
Nate Jensen
428d0c73dc Issue #2142 clean up dependencies and dead code
Change-Id: I30f94c9afb01cdd1b7bef98c6ba40f79c3acea59

Former-commit-id: a636846295 [formerly a636846295 [formerly 593073cade120a95899f4f4d2c5a652c6ac3389a]]
Former-commit-id: f28420dac4
Former-commit-id: 65dbc62b59
2013-07-17 16:30:08 -05:00
Max Schenkelberg
49d8014f85 Issue #2156 added orphan checking to time match basis on time match and set to null if not on any descriptor
Amend: Accepted ticket

Change-Id: I27df5b96cc411bb3b48850e3c6fb1ee862dbd760

Former-commit-id: 7f94b93c84 [formerly 7f94b93c84 [formerly 782a1b71f83ee3d0db7b7df82eecabe7f7fecd4f]]
Former-commit-id: 29943f945c
Former-commit-id: a2210eebf9
2013-07-17 16:12:36 -05:00
Dave Hladky
f5ea1f0327 Issue #2184 Removed all other HUCs other than ALL from storage
Change-Id: I04885f5162cbe25b4345fe797da5a6f7ac246cc5

Former-commit-id: 84dae0a6b8 [formerly 84dae0a6b8 [formerly 251cf3cca7c6653300f115083aa860444fee0ea9]]
Former-commit-id: bd03085f8d
Former-commit-id: 15738a4d30
2013-07-17 15:18:49 -05:00
Nate Jensen
6d8c46e6d6 Issue #2142 logback cleanup
Change-Id: I48716f940fd2c8545d372bd16d881f87a75311f1

Former-commit-id: 81d9a28d53 [formerly 81d9a28d53 [formerly 38ee29e206824a1beeaad5837d731804b4affbdc]]
Former-commit-id: a0aeeedd23
Former-commit-id: 447ac6311d
2013-07-17 14:03:43 -05:00
Mike Duff
299845987c Issue #1655 - Implement the framework for DD system status messaging
Change-Id: I621cd07fdf6a742b0af4408dad534844d08e9e55

Former-commit-id: 7acfe076a0 [formerly 7acfe076a0 [formerly 4f51d50f9d6ea76f3b2cb2e828c6b6f8e192fb38]]
Former-commit-id: 2c98a91d05
Former-commit-id: 218c46928b
2013-07-17 08:55:27 -05:00
Roger Ferrel
798c82f832 Issue #2088 Changes for non-blocking PrintTextReportDlg and TextReportDlg.
Change-Id: I0f999c8334aefb3f2d0e27d91bdea419a96d65e6

Former-commit-id: 6f6da35020 [formerly 6f6da35020 [formerly 648aa82a0d6b10a92a44df55eb278b6cc4c9bc1b]]
Former-commit-id: edb32da7ce
Former-commit-id: 79f72c3195
2013-07-16 14:03:20 -05:00
Ben Steffensmeier
0a48ee47f7 Issue #2158 Allow VizGlobalsManager to work without accessing UI thread.
Change-Id: I3cb8e97d68a76b371a93a52b1c4f7b860b0847c1

Former-commit-id: 872ad4dfa9 [formerly 872ad4dfa9 [formerly d3621cf3155841086cd24eecf4543bd70c890e41]]
Former-commit-id: ffed387cce
Former-commit-id: 9606262e7e
2013-07-16 11:04:08 -05:00
Roger Ferrel
a0b46a31ba Issue #2088 changes for non-blocking RatingCurveDlg, FindReplaceDlg and TextEditorDlg.
Change-Id: I8d651254e862a45c1dad33c0d4991b29f1611828

Former-commit-id: d620283c3b [formerly d620283c3b [formerly d71b87606a93f744984f45aec8887dbc0052bb4e]]
Former-commit-id: 3eacead9bb
Former-commit-id: c556150c27
2013-07-16 10:28:32 -05:00
Lee Venable
b85743a62d Merge "Issue #2088 Changes for non-blocking DataSourcesDlg, ImpactStatementDlg and LowWaterStatementDlg." into development
Former-commit-id: c1371b2429 [formerly c1371b2429 [formerly ba0218361df0703fa7600f0f32459aa2fd846d62]]
Former-commit-id: e78b2c6cfc
Former-commit-id: 82267f30fd
2013-07-16 09:15:57 -05:00
Lee Venable
159d5ae041 Merge "Issue #2141 - Fix envelope validation for DD areal filter and selection dialogs" into development
Former-commit-id: c047f90db2 [formerly c047f90db2 [formerly 78996d6a3e7cb15f5084d30f02c8cf7c02e832b2]]
Former-commit-id: 59018aeaae
Former-commit-id: 6a4a291218
2013-07-16 08:50:10 -05:00
Mike Duff
70b13f9195 Issue #2166 - Fix to not open graph from CAVE menus
Change-Id: If77854e7ea4e0c703649e2e1bc322b3833d21996

Former-commit-id: 03a9dcc4e3 [formerly 03a9dcc4e3 [formerly f6d940c02245d59782d318fb482886a0df3216a9]]
Former-commit-id: 764e4966d1
Former-commit-id: 8fc208e818
2013-07-16 08:29:15 -05:00
Ben Steffensmeier
5b68e9d57c Issue #2107 Fix sampling of grid vector arrows.
Change-Id: If663d487fa31cba43d18b82bf93fdfacbbc65721

Former-commit-id: 767915b318 [formerly 767915b318 [formerly eae0b3931a3f5888b32c49a8c7e5b97addb3201a]]
Former-commit-id: 4a25b32919
Former-commit-id: abedf0f23a
2013-07-15 15:51:41 -05:00
Roger Ferrel
2b4393850d Issue #2088 Changes for non-blocking DataSourcesDlg, ImpactStatementDlg and LowWaterStatementDlg.
Change-Id: Ib6b6a6b6a2b0c433c30ac31beb6858e4c7a0c768

Former-commit-id: 0ba32179e6 [formerly 0ba32179e6 [formerly cf769302b9a9b2055f42969dfe781d7aa9c2286b]]
Former-commit-id: e8d21c5d91
Former-commit-id: ccd83dab88
2013-07-15 14:26:35 -05:00
Max Schenkelberg
a47f187f4f Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: 63421a4819 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]
Former-commit-id: 50825200a1
Former-commit-id: 1610826d2e
2013-07-15 14:26:15 -05:00
Lee Venable
54ab7ba176 Merge "Issue #2096 - Display of Madis point data" into development
Former-commit-id: 7a00e7eb24 [formerly 7a00e7eb24 [formerly 03bb912e339342ce7aab76abaf1d76f4522e7b01]]
Former-commit-id: 546524f278
Former-commit-id: fb0b7b4dd6
2013-07-15 13:20:06 -05:00
Roger Ferrel
4462cdf67f Issue #2088 Changes for non-blocking CrestHistoryDlg.
Change-Id: Iebb031464ab25d1212b1748789f79051528d0c3a

Former-commit-id: b394c8fa41 [formerly b394c8fa41 [formerly fc0cd12d87493527c6a7ddaddd70b77182a7390f]]
Former-commit-id: 68bc54c334
Former-commit-id: e73bfc1a54
2013-07-15 07:56:14 -05:00
Mike Duff
a4cecf0180 Issue #2141 - Fix envelope validation for DD areal filter and selection dialogs
Change-Id: I401f44d9a8392f97e1b6ab7c769e3fbfb23a36d6

Former-commit-id: 9454dd76a7 [formerly 9454dd76a7 [formerly b1ca1bb2ceb576e8e8664289e83e06708532bc97]]
Former-commit-id: acf1f266e3
Former-commit-id: bad75bd14c
2013-07-12 16:12:41 -05:00