Commit graph

1158 commits

Author SHA1 Message Date
Steve Harris
4f27cbb406 12.11.1-6 baseline
Former-commit-id: fba4a443a0 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 08fc9f6b14
2012-10-18 15:53:01 -05:00
Steve Harris
dff8d5de9c 12.11.1-5 baseline
Former-commit-id: 03f3f3c36a [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: a0eaf651ff
Former-commit-id: e31c1e5bba
2012-10-18 15:46:42 -05:00
Roger Ferrel
71c69e504e Issue #1229 Changes for non-blocking SWTMessageBox.
Change-Id: Id9954878c2764f4527e85b958a0fec7a05548db9

Former-commit-id: 610444ee88 [formerly 610444ee88 [formerly b073d27b36543630e3fd04623e22cd5242e5ed1f]]
Former-commit-id: 38ae2b122e
Former-commit-id: db1a29205a
2012-10-18 14:06:02 -05:00
Ben Steffensmeier
d6b9f717a4 Issue #1279 change GridCoverage to choose more reasonable longitude ranges, use a 0 central meridian for huge grids to avoid normalization in geotools, fix intersections in GridGeometryProjections to work for unnormalized areas, fix data wrapper world wrap detection to work for any crs which doesn't normalize.
Former-commit-id: 2f7a04f8ef [formerly 2f7a04f8ef [formerly 908b9ec666e5dfb50ef4fe3899bf2288bf4cecc5]]
Former-commit-id: e3cc30e8a8
Former-commit-id: a67d5e2b6c
2012-10-18 12:39:01 -05:00
Jonathan Sanchez
aa06ef1c3a Issue #1126 Fixed refactor bugs.
Former-commit-id: 4cf0b68aa2 [formerly 4cf0b68aa2 [formerly eb95e6227b229cc8d627b4ac24254c2f2c2e3023]]
Former-commit-id: d1bf86e2fe
Former-commit-id: 86e07328db
2012-10-18 11:32:01 -05:00
Lee Venable
db8be823fc Merge "Issue #1275 Merged code from 1225 on top of SS changes." into development
Former-commit-id: dde9d4b802 [formerly dde9d4b802 [formerly ca3b359ba6a8b3131f32b9341781d19378240402]]
Former-commit-id: ea61e22d2e
Former-commit-id: fd9338320f
2012-10-18 11:16:37 -05:00
Roger Ferrel
05c83289b6 Issue #1229 Changes for non-blocking SetTimeDialog.
Change-Id: I0a5d497a29b5a6e9e7441e130ce081058e78f4e3

Former-commit-id: 40fb3f9729 [formerly 40fb3f9729 [formerly 5e4edda802714c236334500a12c2020386770dd2]]
Former-commit-id: 4cd2f1c851
Former-commit-id: 7a095d2d99
2012-10-18 07:36:31 -05:00
Roger Ferrel
fae6e2ec44 Issue #1229 Changes for non-blocking LabelOffsetDialog.
Change-Id: Ic0d821549a300c53e29f4c321af3c51e22fb308e

Former-commit-id: 66379c3210 [formerly 66379c3210 [formerly f1131f2d9d1d5e0194a65e787e2628e733563683]]
Former-commit-id: d319101ed9
Former-commit-id: 928e9f6a1d
2012-10-17 15:12:55 -05:00
Lee Venable
a26e49ad74 Merge "Issue #1229 Changes for non-blocking ImagingDialog." into development
Former-commit-id: 77de744b4e [formerly 77de744b4e [formerly 2a7f9d1d5bab1c3edc8c6ac2f424e0b8865bc4c6]]
Former-commit-id: 74a9c05db5
Former-commit-id: 3b3c636de4
2012-10-17 14:07:37 -05:00
Richard Peter
88b80f406d Merge "Issue #1265 remove pypies gzip handling" into development
Former-commit-id: 3723250e50 [formerly 3723250e50 [formerly fd47306a1247721d53b227bf94cc94818b4efc39]]
Former-commit-id: cd9306a537
Former-commit-id: c7894c5cda
2012-10-17 14:07:28 -05:00
Roger Ferrel
b164d67e54 Issue #1229 Changes for non-blocking ImagingDialog.
Change-Id: Iddcbf248949a082f734f6b5de8d8941089746468

Former-commit-id: c73acb0c30 [formerly c73acb0c30 [formerly 185024d06da214041273674716a7efce4b2a98f1]]
Former-commit-id: 460acb4337
Former-commit-id: b42cae4034
2012-10-17 13:53:29 -05:00
Jonathan Sanchez
021114b9b5 Issue #1275 Merged code from 1225 on top of SS changes.
Former-commit-id: 36efd259d5 [formerly 36efd259d5 [formerly ace2ccf5653fcd791bc049ca17986b233a6a54cc]]
Former-commit-id: 9017f4b046
Former-commit-id: ecfc924a4b
2012-10-17 13:30:44 -05:00
Richard Peter
efdd09b5d6 Issue #1257: Revert radar file name changes. Change grib path to just be by master level name.
Change-Id: If3515614408906a5dc0e54b4c8d261fae5fcaf26

Former-commit-id: 85eb3b7598 [formerly 85eb3b7598 [formerly ca23e50157bb0c381dbcd6bf4d4f08bbd0a35f6f]]
Former-commit-id: 72acca2422
Former-commit-id: 8cb830c1c6
2012-10-17 13:22:00 -05:00
Nate Jensen
60ad3b55f2 Issue #1265 remove pypies gzip handling
Change-Id: Ia79c1b7b2440849893bacf5cd8290fb5627ed4e5

Former-commit-id: fa3e87549a [formerly fa3e87549a [formerly 6bb4d39b266bedbecff6ecda95bf05e65aa1e58c]]
Former-commit-id: 2dac2f5dde
Former-commit-id: 740146d838
2012-10-17 11:32:49 -05:00
Roger Ferrel
a53f94e93d Issues #1229 Changes for non-blocking ColormapDialog.
Change-Id: I95126e4d7e0b450e014764c96caf93cdff9c2d8d

Former-commit-id: 8e86f32714 [formerly 8e86f32714 [formerly 88476b683c5c480395edacd2920e32a0589a92e5]]
Former-commit-id: 6833c7e04c
Former-commit-id: d5acf40cc2
2012-10-17 10:20:18 -05:00
Roger Ferrel
f891be22d1 Fix for TextEditorDialog in merge of 12.11.1-4 baseline
Change-Id: I5e5e39af2bd7f2bfc9dd10ab0ddf87ff80cb7b76

Former-commit-id: f4a2d13df1 [formerly f4a2d13df1 [formerly 1cf3c76428719ebc7f06612b8525057e9345a56e]]
Former-commit-id: 8934186397
Former-commit-id: 6199f7f516
2012-10-17 08:51:52 -05:00
Jonathan Sanchez
f9d20b4775 Fixing DataAdaptorFactory blunder in merge of 12.11.1-4
Change-Id: Id8cc463b78e66632fd05675abdd144dccef5bb9f

Former-commit-id: 1e53f0122a [formerly 1e53f0122a [formerly 89a30cf738bb64b26da16048f61af0585ded97e7]]
Former-commit-id: f578372896
Former-commit-id: 9524cca5b1
2012-10-17 08:50:00 -05:00
Lee Venable
7be0bb0af6 Merge "Issue #1229 Changes for non-blocking SaveColorMapDialog." into development
Former-commit-id: 526085140a [formerly 526085140a [formerly 191537fbfc3e1933121cf133f7b906a9f59cab3d]]
Former-commit-id: a256a54ab7
Former-commit-id: 78eb24ee17
2012-10-17 08:26:53 -05:00
Steve Harris
ea34163a1c Fixing fields duplicated in merge of 12.11.1-4 baseline
Former-commit-id: 34e7b3f4a3 [formerly 34e7b3f4a3 [formerly 477c64cbd4614e080d84fe1b0b5733274eeee838]]
Former-commit-id: 8703ff00c7
Former-commit-id: dc5eba737d
2012-10-17 08:21:19 -05:00
Roger Ferrel
d9cfa1f2f6 Issue #1229 Changes for non-blocking SaveColorMapDialog.
Change-Id: I5308c5f2ca546c825863f89162f2f1143f0431fc

Former-commit-id: 5e79024db3 [formerly 5e79024db3 [formerly b902eadfca48628bf8944d97019263e94618667a]]
Former-commit-id: 7f3ab5434c
Former-commit-id: f77e146c65
2012-10-17 08:15:21 -05:00
Steve Harris
b28a8e5113 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: a63b40b17a [formerly a63b40b17a [formerly ecb6a8876078dcff3414ff2a33aa14bf130fa075]]
Former-commit-id: 5e5c98b193
Former-commit-id: be16909d2d
2012-10-16 21:44:49 -05:00
Roger Ferrel
a6e13f80d4 Issue #1229 Changes for non-blocking BackgroundColorDialog.
Change-Id: Ie3d72e33a33ebdd12fe0b66047fd211e049474d9

Former-commit-id: 59a2dd6a3a [formerly 59a2dd6a3a [formerly 23c93af437fa662cc7df98e69a8bd383aabbab41]]
Former-commit-id: d60b4ca396
Former-commit-id: 757affcc66
2012-10-16 17:00:11 -05:00
Steve Harris
ad78266035 Merge branch 'ss_builds' (12.11.1-4) into development
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/procedures/IAlterBundleContributor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/AlterBundleDlg.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/CoordinateInputPanel.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointEditDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/dialog/PointsMgrDialog.java
	cave/com.raytheon.uf.viz.points/src/com/raytheon/uf/viz/points/ui/layer/PointsToolLayer.java
	cave/com.raytheon.uf.viz.radarapps.core/src/com/raytheon/uf/viz/radarapps/products/ui/BaseRadarProductUI.java
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/ToolsAlterBundleContributor.java
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMaps.py
	cave/com.raytheon.viz.gfe/help/EXAMPLElocalMapsAdd.py
	cave/com.raytheon.viz.gfe/help/localMapsConfig.html
	cave/com.raytheon.viz.gfe/help/mapConfig.html
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
	edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/Maps.py
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/DbShapeSource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/ShapeTable.py
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/util/WorldWrapCorrector.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
	rpms/common/yum/arch.x86/comps.xml

Former-commit-id: 4610ecc513 [formerly 4610ecc513 [formerly 07beab271f793ae79fcf9233f9d384702ead22a9]]
Former-commit-id: 751563e331
Former-commit-id: 0c0c1144c6
2012-10-16 15:48:14 -05:00
Roger Ferrel
840f6cd220 Issue #1229 Changes for non-blocking ProcedureListDlg.
Change-Id: I5c955c9d07e104809e2a72de0f5ec998f13d797f

Former-commit-id: 1a1f1a0601 [formerly 1a1f1a0601 [formerly ea4c2898013df2107ebded11aa1561035eaf8a00]]
Former-commit-id: d51ba247d1
Former-commit-id: 85f8c1f282
2012-10-16 15:39:12 -05:00
Steve Harris
560f0d9cc3 12.11.1-4 baseline
Former-commit-id: d3497e47eb [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
2012-10-16 13:27:07 -05:00
Lee Venable
7e2450cb52 Merge "Issue #1229 Changes for non-blocking ProcedureDlg." into development
Former-commit-id: ab5f3fb23a [formerly ab5f3fb23a [formerly bbd65e811b2a9ca5f69af1f8fe7eea9c8e2fc70e]]
Former-commit-id: 6cd8592d80
Former-commit-id: 5f702fc834
2012-10-16 13:14:02 -05:00
Greg Armendariz
041b833d53 Merge changes Ibe8b9a97,If48f637e into development
* changes:
  Issue #1252 - Checked in wrong file. Deleting it. Change-Id: Ibe8b9a9708e37f7e697e7133b98d24a0060ebd37
  Issue #1252 - Updated with changes from Dale Morris


Former-commit-id: d1772b3705 [formerly d1772b3705 [formerly ab6631a9b47cb5bc6716bc3ba9805bd40665f785]]
Former-commit-id: b8de817d68
Former-commit-id: 2c058c6b8a
2012-10-16 12:59:00 -05:00
Roger Ferrel
8bf8bd190f Issue #1229 Changes for non-blocking ProcedureDlg.
Change-Id: Iefdf2f8e8ceeb7af5173dd4c630b6abc2c1ce41a

Former-commit-id: 683c49fc49 [formerly 683c49fc49 [formerly 207c1dfec7f51a429c9db61258d09631ef2049c9]]
Former-commit-id: d9fee38d21
Former-commit-id: f685ac224f
2012-10-16 12:53:39 -05:00
Steve Harris
8caedc3cec Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 9853e8c53b [formerly 9853e8c53b [formerly 8a2bda87f34ec3c1129429604de7344732d46017]]
Former-commit-id: b4bb93a2c4
Former-commit-id: 3d88dcb2b8
2012-10-16 11:50:37 -05:00
Roger Ferrel
e960e1acdd Issue #1229 Changes for non-blocking HistoryListDlg.
Change-Id: Iffd288fed390121dfec770fd451c028ca78face2

Former-commit-id: 46eafd72e7 [formerly 46eafd72e7 [formerly d8c36ff080bf42da11ab4d770fd022a6e2359f4f]]
Former-commit-id: 23db6f4981
Former-commit-id: 5a6d2af7c8
2012-10-16 11:01:07 -05:00
Roger Ferrel
ddf627de66 Issue #1229 Changes for non-blocking AlterBundleDlg.
Change-Id: Icea110c4ff66360e2d406a1f2966cf6851fbddc1

Former-commit-id: 59f21825ae [formerly 59f21825ae [formerly fa1a55648d6d98104b0861db5e45c5de73612a09]]
Former-commit-id: acb0ca9c6f
Former-commit-id: 4ea86be01d
2012-10-16 10:28:15 -05:00
Steve Harris
ff2bbbcec6 Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: e38fc1e5c9 [formerly e38fc1e5c9 [formerly 16bfc9f7e68cc45b44867fc41cf62cd12f323390]]
Former-commit-id: 615042859f
Former-commit-id: 5384c8fa71
2012-10-16 09:21:22 -05:00
Steve Harris
99147526f9 Merge branch 'ss_builds' (12.11.1-3) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPointComparator.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java

Former-commit-id: 0a42cb87a4 [formerly 0a42cb87a4 [formerly 5ebfa0e773d325c57ac8097b46537817d5d47842]]
Former-commit-id: 63ffdac2b7
Former-commit-id: 63da835aef
2012-10-16 09:20:37 -05:00
Roger Ferrel
bc0088c3c1 Issue #1229 Changes to non-blocking ImageBlinkDialog.
Change-Id: Ifec323bfc7c44b928d0d135c346c3536fe7ceb96

Former-commit-id: b139d0fc24 [formerly b139d0fc24 [formerly b6e7c9d63de65a9523448ff691db6f88f7514f52]]
Former-commit-id: 4792c77aab
Former-commit-id: 06a7728662
2012-10-16 09:17:47 -05:00
Steve Harris
9e2854854e Merge "Issue #1229 Changes to make non-blocking CreateProjectionDialog." into development
Former-commit-id: 8f1c76c3f5 [formerly 8f1c76c3f5 [formerly ba4a18d8a7eb8cf0eae99656c48273cf5406dabf]]
Former-commit-id: 0ccb08d42a
Former-commit-id: 0931256948
2012-10-16 09:12:20 -05:00
Roger Ferrel
846f2fea7e Issue #1229 Changes for non-blocking DisplayPropertiesDialog.
Change-Id: If19a36fe150c85d92e85a56b931dc66ba9a251b3

Former-commit-id: a495dee0c9 [formerly a495dee0c9 [formerly 3cf1be917057f6a3db71ae3b408e46ca1e972f11]]
Former-commit-id: 566ce2d976
Former-commit-id: 80c2beec21
2012-10-16 08:02:23 -05:00
Roger Ferrel
8c8ae4940f Issue #1229 Changes to make non-blocking CreateProjectionDialog.
Change-Id: Ic7150a3e0dc5fb0cf0c5f4f32c3d107b6c7f7d1c

Former-commit-id: 96a6dc145c [formerly 96a6dc145c [formerly 0e5aed1eb8a1edcf0a6bce196fdbcaf65cf6bc62]]
Former-commit-id: a3fbfef3ce
Former-commit-id: 8f33c1d0a6
2012-10-16 07:33:39 -05:00
Richard Peter
3ef8bbab2f Issue #1257: Update grib path keys to include hdf5 layout. Turn on TcpNoDelay
Change-Id: I296d0d4b1c204a325c499b3aeb1f9d7f16de0c9b

Former-commit-id: 68ac1abca4 [formerly 68ac1abca4 [formerly 29b54f75013685f1bcd9ed3129c9ba3ddf629395]]
Former-commit-id: c5e3b54caa
Former-commit-id: a80db469b2
2012-10-15 20:15:39 -05:00
Richard Peter
36500ec260 Merge "Issue #1257: Fix NSharp point retrieval" into development
Former-commit-id: 12b660ba74 [formerly 12b660ba74 [formerly 44c83649bab7a5e3cc8613ed654ab2907d090421]]
Former-commit-id: 18f451aea7
Former-commit-id: 1fc2ba7d2e
2012-10-15 19:41:26 -05:00
Richard Peter
a8b4b8ac8b Issue #1257: Fix NSharp point retrieval
Change-Id: I50e27a10c987dfb373c8431bff7a18f50563f4b4

Former-commit-id: 25fe0aef5b [formerly 25fe0aef5b [formerly 3a6ee9b778035d62285be6d1e5ff08f240ba8c51]]
Former-commit-id: 3fa2a8b894
Former-commit-id: d434d967dd
2012-10-15 19:40:20 -05:00
Richard Peter
33675ad271 Merge "Issue #1260 Fix non-overlapping grids" into development
Former-commit-id: 80e78b722f [formerly 80e78b722f [formerly 182a6039347848d11a5ced10e50fea40269ed95b]]
Former-commit-id: 4803fd42bb
Former-commit-id: a5874c822d
2012-10-15 18:33:08 -05:00
Ron Anderson
c51420fecb Merge "Issue #1257: pypies add base group if not specified" into development
Former-commit-id: 2b5236635a [formerly 2b5236635a [formerly 396eb56b51bf75ebe68e0a78289c132de3f91419]]
Former-commit-id: efbadb9c27
Former-commit-id: 7e9d082e29
2012-10-15 18:32:12 -05:00
Ron Anderson
91f3fe6eec Issue #1260 Fix non-overlapping grids
Change-Id: I27bc2a2d4db33abb81c1733046e8eef5729a4384

Former-commit-id: b31e52cbd0 [formerly b31e52cbd0 [formerly 6b05875f6bd24d027bb5817eee9b412bb83f9b3a]]
Former-commit-id: bce2713c31
Former-commit-id: 87e518de29
2012-10-15 18:24:07 -05:00
Lee Venable
cfdb6d837f Merge "Issue #1229 Changes for non-blocking PrintDialog." into development
Former-commit-id: 143ba131d0 [formerly 143ba131d0 [formerly 17b7e3bbae7230bfa40490b84b7b13cf41881649]]
Former-commit-id: 552224976e
Former-commit-id: 99faa86fe5
2012-10-15 16:45:52 -05:00
Steve Harris
bf1f88482b 12.11.1-3 baseline
Former-commit-id: 2d0c424713 [formerly 2d0c424713 [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]
Former-commit-id: 5d796f775c
Former-commit-id: 5723fb0031
2012-10-15 16:30:31 -05:00
Richard Peter
dedb7772fd Issue #1257: pypies add base group if not specified
Change-Id: I3c770b63546790c0ae681e5abce78d117d502d0d

Former-commit-id: f8f1c4b67a [formerly f8f1c4b67a [formerly 510404856e79373c9895bda235e434afbbcd71ed]]
Former-commit-id: cd3ad6cb4a
Former-commit-id: a1deadef0d
2012-10-15 16:11:42 -05:00
Roger Ferrel
2aec2fe200 Issue #1229 Changes for non-blocking HelpUsageDlg.
Reviewer comments.

Change-Id: I4704a93fab83b88041eb942c9a163a6f117a70ea

Former-commit-id: cc3c4f311f [formerly cc3c4f311f [formerly e6ad4922c4bc950fcf9cb184707b3e757373e851]]
Former-commit-id: dc6fa3cfd0
Former-commit-id: b37bea29ba
2012-10-15 15:58:30 -05:00
Roger Ferrel
47d3d275f5 Issue #1229 Changes for non-blocking PrintDialog.
Change-Id: Ia47dffbc611f9214a43754b4e1f8d4c95817462b

Former-commit-id: b27323c29e [formerly b27323c29e [formerly c748615380d65d7a105ffd2e46cf1eba3cb035b9]]
Former-commit-id: 059c8a4d7c
Former-commit-id: a664fc8b8b
2012-10-15 15:24:04 -05:00
Ron Anderson
b5d289d1ac Issue #1260 Change exception handling in GridParmManager.
Change-Id: Ia519a95a32903faa1296b7427f3c4025e6a8b015

Former-commit-id: 6f4efac34a [formerly 6f4efac34a [formerly 298942b7f20ed14b194178637e4ef37db45e8e3f]]
Former-commit-id: 2c89c1ecd6
Former-commit-id: 567e73d56d
2012-10-15 13:24:45 -05:00
Steve Harris
0b1656d8f8 Merge "Issue #1229 Changes for non-blockig TextEditorSetupDlg." into development
Former-commit-id: 807cfcf82c [formerly 807cfcf82c [formerly 562f1c49700afec1b5404f66373de4b6c241abfe]]
Former-commit-id: a36df8e195
Former-commit-id: 422fadc393
2012-10-15 11:50:56 -05:00