Commit graph

28 commits

Author SHA1 Message Date
Ben Steffensmeier
1815c1a34e Issue #229 moving caches into the caveData directory
Change-Id: I3d502ef858939738adf1835d2292f55e2b3edc44

Former-commit-id: c9b71ae872 [formerly 55404ff39b] [formerly fc541f61a7] [formerly c9b71ae872 [formerly 55404ff39b] [formerly fc541f61a7] [formerly b3da2a3429 [formerly fc541f61a7 [formerly a499df61044947aaf40ac118e1476f41736419b0]]]]
Former-commit-id: b3da2a3429
Former-commit-id: b353c502b5 [formerly 4727943a5f] [formerly fcf2423ba4650e08e61209a5c63f758d40b78170 [formerly 699ad82d97]]
Former-commit-id: 2765f289323db4bcbfb3ecedeed31402bcead5b3 [formerly 48469f7077]
Former-commit-id: 0f2f666572
2012-02-01 15:26:34 -06:00
Ben Steffensmeier
42ef274021 Issue #228 change plots, grid icons, and radar icons
to use a new PointImageExtension which provides an
interface for drawing images at a single point,
which kml can use to extract plot images.

Change-Id: I29b07ed4f9e8ea95ed131ab1eb3ca27efadaf0e2

Former-commit-id: 0fe5fe9c99 [formerly 792dc75f4d] [formerly d976603262] [formerly 0fe5fe9c99 [formerly 792dc75f4d] [formerly d976603262] [formerly 13a99abe7b [formerly d976603262 [formerly 0f56c76ab830ef088a9576301c795dca7c855033]]]]
Former-commit-id: 13a99abe7b
Former-commit-id: 7c0e0c0365 [formerly ec90cad810] [formerly 74f934c8254e91895c63256920cd1aef0bf21fd8 [formerly 63ef103145]]
Former-commit-id: efb9f151d1843415599b612d587198c7b55787fa [formerly 70e38a4506]
Former-commit-id: f6b65b8467
2012-02-01 12:45:56 -06:00
Nate Jensen
16e1fd255b Merge "Issue #227 enhanced caching of maps for thin client" into 4-Thin_Client
Former-commit-id: 866627aaf3 [formerly 6a49a1bec3] [formerly 0608677c67] [formerly 866627aaf3 [formerly 6a49a1bec3] [formerly 0608677c67] [formerly b1810ddd3f [formerly 0608677c67 [formerly 825ddae7e604056e254530e225118f92d88d4b5c]]]]
Former-commit-id: b1810ddd3f
Former-commit-id: e49feb41cd [formerly 84aa8509e4] [formerly 93d0e49a083e8ce8673d74d19d46357d1cf3406d [formerly 8a0c505bac]]
Former-commit-id: e3112b7510567033ed3507c00fa82e475b0e8317 [formerly f7541736f7]
Former-commit-id: 5071f2fd79
2012-02-01 08:45:42 -06:00
Ben Steffensmeier
4d9bd2fa9b Issue #227 enhanced caching of maps for thin client
Change-Id: Ib2c6665d1725bcfde70be6ed5a490e68115c6b94

Former-commit-id: 2c1110953c [formerly 138b4de82f] [formerly 0617773c79] [formerly 2c1110953c [formerly 138b4de82f] [formerly 0617773c79] [formerly 9b78596436 [formerly 0617773c79 [formerly 067ba5b7d28174d99119d5bf87a28334578f78dd]]]]
Former-commit-id: 9b78596436
Former-commit-id: 68e1a7c2f1 [formerly 5deb83a291] [formerly ed3367219c6c038731023f39d10bc892cdd2132f [formerly a714f57f78]]
Former-commit-id: 2e5faaafda0772397c471d118d97379815249b52 [formerly 82db9d2c0c]
Former-commit-id: 774f2614d0
2012-01-31 10:53:10 -06:00
Nate Jensen
c131f84016 Merge "Issue #176 Change plots to no longer require id in updates. Change thin client updates to request pdo's instead of redoTimeMatching, which grabs any updates, not just new resource times." into 4-Thin_Client
Former-commit-id: 8f30e11487 [formerly c180ba7bfd] [formerly b50765ded4] [formerly 8f30e11487 [formerly c180ba7bfd] [formerly b50765ded4] [formerly ec1188f95f [formerly b50765ded4 [formerly 8df2c8fdd7bdf92806e4c1241083e9969e02ca76]]]]
Former-commit-id: ec1188f95f
Former-commit-id: 944185df05 [formerly 47bd783056] [formerly e22b7bfe4c6068de30936c747c1cf13d96027766 [formerly 2925a1638f]]
Former-commit-id: ce569989e04b1c266652cae72866513c03c86272 [formerly 866b1b79d6]
Former-commit-id: ebaf7dac17
2012-01-30 17:16:47 -06:00
Ben Steffensmeier
e15eb35dc0 Issue #176 Change plots to no longer require id in updates. Change thin client updates to request pdo's instead of redoTimeMatching, which grabs any updates, not just new resource times.
Change-Id: I23763bae287d5c49d3973707228e78144cc83ab1

Former-commit-id: 539ebd56d3 [formerly 6194dc8210] [formerly 9cc983549d] [formerly 539ebd56d3 [formerly 6194dc8210] [formerly 9cc983549d] [formerly 9254b762ff [formerly 9cc983549d [formerly 94d4feb2973ed201d369a21126b3443606041179]]]]
Former-commit-id: 9254b762ff
Former-commit-id: 174dd81c57 [formerly 75f49627c8] [formerly 2274967c42d2f8b4145457a05f022995e7ac081d [formerly 484a0f64f8]]
Former-commit-id: 6a86c4e1118e38197943db10530a027ffb9a08f8 [formerly 0c4a26a41c]
Former-commit-id: a7bc0dc8f3
2012-01-30 17:04:47 -06:00
Nate Jensen
3cb5894e3f Merge "Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored.." into 4-Thin_Client
Former-commit-id: dc7c3ea979 [formerly b85da11f1b] [formerly 5f7b1e87b4] [formerly dc7c3ea979 [formerly b85da11f1b] [formerly 5f7b1e87b4] [formerly cc1cf725b7 [formerly 5f7b1e87b4 [formerly 48179dbabb5cd5a60c345ad0bdd8bda9fdcf9bd9]]]]
Former-commit-id: cc1cf725b7
Former-commit-id: d045890f8b [formerly a7a6ed0b78] [formerly 6c196987094f5957eec981b7ec767d0480bca0d1 [formerly f4fe967eba]]
Former-commit-id: 7d6d2446ea413e83e268dfe14d5110082fcf1a31 [formerly 213cc51b86]
Former-commit-id: 2571a16a4e
2012-01-30 16:45:56 -06:00
Ben Steffensmeier
8c733c95b1 Issue #185 change LevelFactory to throw exceptions when there is no network connection so that everything can be reinitialized when the connection is restored..
Change-Id: Id5c82e7d01e7f229bc99366b1339bc38333ffa5a

Former-commit-id: 700cb47baa [formerly 3c673896a0] [formerly b3463d27fc] [formerly 700cb47baa [formerly 3c673896a0] [formerly b3463d27fc] [formerly 0d75fbf942 [formerly b3463d27fc [formerly 1b2496a6db33fc65efecfdffb380d8b4e07ec590]]]]
Former-commit-id: 0d75fbf942
Former-commit-id: 13f6e4f868 [formerly 8b1cdd8db1] [formerly 3e19b92cbce5cee988b6ee87c18925f5342d0749 [formerly c22f135dbc]]
Former-commit-id: 42253bc94fbbcaf565d110a034287d18a8369666 [formerly 713811bb95]
Former-commit-id: 50d560a874
2012-01-30 16:39:57 -06:00
Roger Ferrel
8583722a44 Issue #27
Changes for alertviz exit

Former-commit-id: bd73fb18a8 [formerly f0e7a527e4] [formerly e4718d87aa] [formerly bd73fb18a8 [formerly f0e7a527e4] [formerly e4718d87aa] [formerly b2254f8df4 [formerly e4718d87aa [formerly fbc018e6786730b7b597fbe5a179dc6880186b99]]]]
Former-commit-id: b2254f8df4
Former-commit-id: bd3240e530 [formerly 9a59cbc9de] [formerly 0b73c6cd0b03145d357ead8f21e1fc31967a23cb [formerly b2f5691167]]
Former-commit-id: 66329ad5abad76f6048942a06d4237f61351887a [formerly 3b7d7ad2ad]
Former-commit-id: 10cfe30d45
2012-01-30 16:25:53 -06:00
Ben Steffensmeier
e2c62ab096 Issue #183 change grib data catalog to use bulk requests to retrieve all coverages at once.
Change-Id: I99f3dfc7900b57b074062155a4e7a65851f70170

Former-commit-id: e76323dc97 [formerly d90356d266] [formerly 113722a596] [formerly e76323dc97 [formerly d90356d266] [formerly 113722a596] [formerly dfd869c1c1 [formerly 113722a596 [formerly 3cdfc8f73cce96c00b7ac37a1e34e9d051b628b6]]]]
Former-commit-id: dfd869c1c1
Former-commit-id: 573108f2c5 [formerly f2ff133117] [formerly 09449968f9cc4d3fac177bbbf9f58f412fe658c0 [formerly f082727112]]
Former-commit-id: 9649bd78778fa82525127c827ee65f451beab1a7 [formerly 7335f90bfb]
Former-commit-id: 0d9cbcd09e
2012-01-27 14:48:40 -06:00
Ben Steffensmeier
0dadc50c9b Issue #33 rearrange Thin Client preferences to allow connectivity preferences to enable/disable other preferences when they are selected.
Change-Id: I3647ea498e9e44d7175cc755183fefa3d322c059

Former-commit-id: e74b1747a0 [formerly 71ba2e305b] [formerly ab1273cc02] [formerly e74b1747a0 [formerly 71ba2e305b] [formerly ab1273cc02] [formerly 563f93b261 [formerly ab1273cc02 [formerly 53fac28e86ae499846a54cc175f72e2e16b24e37]]]]
Former-commit-id: 563f93b261
Former-commit-id: 168b8f9ee9 [formerly c603c5fdde] [formerly ea5d145fb5ede8d77faee7290f876e2a92dc9576 [formerly d9151fb62e]]
Former-commit-id: 5ebc43b7a1737d3e3bfc6f4f02d2ba026a3f96af [formerly 8fd50c5841]
Former-commit-id: 36e2e8ebf8
2012-01-27 13:17:08 -06:00
Ben Steffensmeier
a6e97a1d47 Issue #21 update offscreen rendering to work correctly with graphics cards that do not support luminance.
Change-Id: Id04fc4cd643840ddcf39d617d4594def9f013917

Former-commit-id: 73bc155708 [formerly 2306325a34] [formerly eb9062a016] [formerly 73bc155708 [formerly 2306325a34] [formerly eb9062a016] [formerly 554313dcc8 [formerly eb9062a016 [formerly 53fc5959effe94c2775627a3cd88a5c0287c22d3]]]]
Former-commit-id: 554313dcc8
Former-commit-id: b4eed50d5c [formerly f8655c1887] [formerly c6052896e52c6a3d27a2a351e9f0175039987fd1 [formerly 1e463b6d52]]
Former-commit-id: 247acdea6cc52e6b8ce65019cc095a92c80f2067 [formerly 4b26300fd3]
Former-commit-id: b892c4ce3f
2012-01-27 11:50:16 -06:00
Bryan Kowal
8c6ad5f573 Issue #192 - updated deploy-install to remove tmp directory after deployment; removing all baselined tmp artifacts.
Former-commit-id: 4f1c75af04 [formerly e314799f44] [formerly c690ba1e13] [formerly 4f1c75af04 [formerly e314799f44] [formerly c690ba1e13] [formerly bdf268a621 [formerly c690ba1e13 [formerly 23e05be1b40d5bd0cc969bd2c01ba4420fa7c644]]]]
Former-commit-id: bdf268a621
Former-commit-id: 55b89fa2a1 [formerly d1797687ab] [formerly 638f0e0e81f2cabdf06e646fbd863c281c621c8e [formerly 2f2b824273]]
Former-commit-id: 348889b0074b3c3c249696318e459aa1a6330a25 [formerly eed9a2c619]
Former-commit-id: afbbc1bd7a
2012-01-26 17:26:07 -06:00
Ben Steffensmeier
77b44d1ebc Issue #198 enable progress bar for satellite and cancel all jobs when it
is disposed or when it has successfully rendered a frame.

Former-commit-id: e2ba42ca48 [formerly 80766211c7] [formerly e4875ea830] [formerly e2ba42ca48 [formerly 80766211c7] [formerly e4875ea830] [formerly 6bb90885c8 [formerly e4875ea830 [formerly bb0d4d876c130f8d7beba34507466c4024ce3600]]]]
Former-commit-id: 6bb90885c8
Former-commit-id: 9eb242a64a [formerly 5a27eafc32] [formerly f6c6b8910023c4e21af1bf6909d0b9016ac313a7 [formerly 0ae2291e53]]
Former-commit-id: 0c5a36521898c50c58043da0fa02a8a8093dc318 [formerly fd62ad9e1d]
Former-commit-id: e50159821b
2012-01-26 15:45:27 -06:00
Ben Steffensmeier
dc0b48eccb Issue #203 change disposing of the green box in volume browser menus
Former-commit-id: a6af23b84a [formerly 9de1132ae7] [formerly d651a52e44] [formerly a6af23b84a [formerly 9de1132ae7] [formerly d651a52e44] [formerly b4e8701480 [formerly d651a52e44 [formerly acbed0a965c99b946ede87c5e4bd159bc13855a4]]]]
Former-commit-id: b4e8701480
Former-commit-id: 1d0776ecc9 [formerly 7460ec88a2] [formerly b7c35ce3c6db1fa125e478f709b81d11040cbbd7 [formerly 4816f78bc6]]
Former-commit-id: fde4372a57091b06e6c85af8054aa3e72285b29b [formerly 645f764fd2]
Former-commit-id: d1c03c44e0
2012-01-26 15:25:29 -06:00
Ben Steffensmeier
59460ad8f7 Issue #199 Do not endFrame for panes which are not drawn. This prevents
gl from swapping buffers which leads to a flicker on intel graphics
cards.

Former-commit-id: 5ff423894d [formerly 6cdc7f561a] [formerly 6cbe5bbf71] [formerly 5ff423894d [formerly 6cdc7f561a] [formerly 6cbe5bbf71] [formerly 0f906ac4d5 [formerly 6cbe5bbf71 [formerly 05ac4ac87d5371cabc91d82322b2c9728373e8b1]]]]
Former-commit-id: 0f906ac4d5
Former-commit-id: b92663faed [formerly 54990c6377] [formerly d3fb31a063b0236fcdc41f2db8896dcab112716c [formerly 0e27eeebf6]]
Former-commit-id: 5aaad5c1140b31350ef89ef63078a538c2e56c8b [formerly f03edcc502]
Former-commit-id: 3e5db64692
2012-01-26 15:20:56 -06:00
Ben Steffensmeier
de9888bfaa Issue #23 fix the LRUCacheFS so it does not create a cache directory if
it is not using it, it creates different cache directories for different
users and it has better error checking.
Change-Id: I486a98583a0d952fe7753d28ae6a2026e943bfb4
Former-commit-id: 9ee0b17ce4 [formerly 867fecfc6a] [formerly 112679d14a] [formerly 9ee0b17ce4 [formerly 867fecfc6a] [formerly 112679d14a] [formerly 2d0ba75b3e [formerly 112679d14a [formerly a29e7c8028c4d3099627da4a5586b7c6d13b51fb]]]]
Former-commit-id: 2d0ba75b3e
Former-commit-id: 8b81ae24c0 [formerly ebb6070fde] [formerly 60ae89e7a21fac8daac3f41840680d4c73e0dc79 [formerly e06cfaca02]]
Former-commit-id: 8b8f34c936f6ad83e7e2aedd4574e09ae9f0abcf [formerly 2ce5929792]
Former-commit-id: 52d6ca3366
2012-01-26 15:13:40 -06:00
Steve Harris
c793bdf70b Merge "Issue #192 remove cave directory in tools for 4" into 4-Thin_Client
Former-commit-id: 81a42b697f [formerly bc9730feaa] [formerly 642f1e86aa] [formerly 81a42b697f [formerly bc9730feaa] [formerly 642f1e86aa] [formerly e9744bb16a [formerly 642f1e86aa [formerly 49af2e97ac0965ca82a380476e77e7fc928b60ca]]]]
Former-commit-id: e9744bb16a
Former-commit-id: 8253bfdc39 [formerly 7af0ea9387] [formerly eaabb6d10e75aa5dda671adcc241e6ae8b583236 [formerly 9a53baf846]]
Former-commit-id: 9a7c9d0b5cbcb2dce66f0954f1ee9beea6c4c151 [formerly fa6a02e728]
Former-commit-id: ac8f5b34b0
2012-01-25 09:59:56 -06:00
Matt Nash
0a9af2104d Issue #192 remove cave directory in tools for 4
Former-commit-id: 2fd8d51960 [formerly 2d67a6c2c0] [formerly f2b5a637a8] [formerly 2fd8d51960 [formerly 2d67a6c2c0] [formerly f2b5a637a8] [formerly f0801c269d [formerly f2b5a637a8 [formerly 044d6f937d2647bf65f4f7b0fca15e3f86878440]]]]
Former-commit-id: f0801c269d
Former-commit-id: 089c9b1a95 [formerly 3092407a14] [formerly 761c345133fda034be71c8c239fa854fd47729f8 [formerly 080e786ca8]]
Former-commit-id: 35f2dc629fafccf8586aca52424796b9364d8a55 [formerly 8d2422cf8c]
Former-commit-id: d4dc4809c4
2012-01-25 09:40:00 -06:00
Bryan Kowal
eebd1f6beb Issue #197 - merging gridslice changes into git thinclient branch.
Former-commit-id: 79ac259d23 [formerly 3fecaf9a5a] [formerly 710c7af072] [formerly 79ac259d23 [formerly 3fecaf9a5a] [formerly 710c7af072] [formerly a48a3094f0 [formerly 710c7af072 [formerly ae1bd95af06f6413ff17b73b290fda3ab8a13b29]]]]
Former-commit-id: a48a3094f0
Former-commit-id: 49aa09a64e [formerly 1821f12dee] [formerly 4aa5a8ae50eb5f7b9533fdcfb05d524989a9f2cd [formerly ebcff5bae9]]
Former-commit-id: 3a87986b4ac8387b405c9d0b5414187e72f6fc47 [formerly 2f03dada49]
Former-commit-id: ea781be82f
2012-01-23 13:40:59 -06:00
Bryan Kowal
819b77d5d0 Issue #24 - merging jep changes into git thinclient branch.
Former-commit-id: c1d930b119 [formerly be0b6a87eb] [formerly 5039d66b12] [formerly c1d930b119 [formerly be0b6a87eb] [formerly 5039d66b12] [formerly cf4d56d0a0 [formerly 5039d66b12 [formerly 89f42f2933110db2f8ae8ffb299a4de5fa3b87ac]]]]
Former-commit-id: cf4d56d0a0
Former-commit-id: 3bc50618b7 [formerly f6b08149ad] [formerly 04447b381e8f34176bf56aeac8375d7e5d6866ba [formerly 90c33ef882]]
Former-commit-id: 5deeaa5352ab19e9521a87ced725f98ed250df11 [formerly a5a50ccfe0]
Former-commit-id: f0cdfeb9a8
2012-01-23 13:25:11 -06:00
Bryan Kowal
7e2690ee90 Issue #22 - merging Windows MSI installer changes into git thinclient branch.
Former-commit-id: f522b77248 [formerly be61ec82b0] [formerly 48b420cbb2] [formerly f522b77248 [formerly be61ec82b0] [formerly 48b420cbb2] [formerly ff44a81ceb [formerly 48b420cbb2 [formerly afbdec0abdb020d47c592a37d0d0b78633e7e609]]]]
Former-commit-id: ff44a81ceb
Former-commit-id: 5368408482 [formerly bddafa475a] [formerly 68d481a3d913cffc25e47fc6f2eae8a4f8628bf1 [formerly 5eb9afeb98]]
Former-commit-id: b43548f0f51b0647e84191cf2451632da3f62170 [formerly dd1c5cdee4]
Former-commit-id: 28028b9ad3
2012-01-23 12:36:13 -06:00
Bryan Kowal
a89f0a64f0 Issue #202 - restoring rpm directory to ss_sync.
Former-commit-id: d537df4ab0 [formerly 4453ad2d10] [formerly 65e1e4ee0b] [formerly d537df4ab0 [formerly 4453ad2d10] [formerly 65e1e4ee0b] [formerly ea1c82452b [formerly 65e1e4ee0b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]]]
Former-commit-id: ea1c82452b
Former-commit-id: 69f4822ad1 [formerly 9f6780c4dd] [formerly e63dac039e52161602915d3cf34685762acd5d9e [formerly 7f1b468010]]
Former-commit-id: ed7bf459df1503ce7bd9500dc984c56a535b768f [formerly dafb6b18d8]
Former-commit-id: bb662ca175
2012-01-20 13:38:00 -06:00
Bryan Kowal
5609d47b35 Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml.
Former-commit-id: 28957b7118 [formerly 971bf802ac] [formerly 2142afe3f1] [formerly 28957b7118 [formerly 971bf802ac] [formerly 2142afe3f1] [formerly 2b5ee4b940 [formerly 2142afe3f1 [formerly 296d2915b17f0086d93e200d4780663bff34edbb]]]]
Former-commit-id: 2b5ee4b940
Former-commit-id: 4c4fc64253 [formerly a1dbdff475] [formerly e24d39003e4489633c8f3c358cda877ba7831b9e [formerly 2a7b92ec91]]
Former-commit-id: 9e6a3f061015a2573aab1ed70eb6bcd887a1fb1a [formerly 3bcecdfe66]
Former-commit-id: 7afea63245
2012-01-20 11:37:38 -06:00
Matt Nash
52d1583604 remove files that were removed at some point
Former-commit-id: 02bb8004f8 [formerly 3189a44cb0] [formerly aec4a78b47] [formerly 02bb8004f8 [formerly 3189a44cb0] [formerly aec4a78b47] [formerly 88fc441c0f [formerly aec4a78b47 [formerly 952fab8cf1d3b86eba055cef96954a2807d6ecf6]]]]
Former-commit-id: 88fc441c0f
Former-commit-id: 418e6ed431 [formerly 8b9dd8c9c1] [formerly c68534675f454c2e9d3e8422b15ffce661cb9771 [formerly 68fc4dd901]]
Former-commit-id: 86ebb63c541d78c03e50e0b6b64c21e7c26e9c38 [formerly da7ff62e27]
Former-commit-id: 73cb8f4a37
2012-01-19 14:31:53 -06:00
Matt Nash
515196cb86 Moving 12.1.1 into ss_sync
Former-commit-id: d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly d8da2252c3 [formerly 580e2938d7] [formerly 66be3bec40] [formerly c83e5ff474 [formerly 66be3bec40 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]
Former-commit-id: c83e5ff474
Former-commit-id: fa4cd88c90 [formerly 82300ccdcf] [formerly 21d2361f00 [formerly 1faae42484]]
Former-commit-id: 21d2361f00
Former-commit-id: bcc32c10bc
2012-01-19 11:53:12 -06:00
Bryan Kowal
5c81820a8a Issue #34 - merging build changes originally made for the new svn transition into git.
Former-commit-id: 48c7c3b950 [formerly 63f6f44fe1] [formerly 43c3807a32] [formerly 48c7c3b950 [formerly 63f6f44fe1] [formerly 43c3807a32] [formerly 9d64e1df12 [formerly 43c3807a32 [formerly 40f016a9f9e605b039d41ed44a59a269caf8a024]]]]
Former-commit-id: 9d64e1df12
Former-commit-id: f19cf1c4ee [formerly 281be5e0b7] [formerly 9ceb347a77 [formerly 06187b93be]]
Former-commit-id: 9ceb347a77
Former-commit-id: 5d92644c26
2012-01-18 16:00:45 -06:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00