Commit graph

28 commits

Author SHA1 Message Date
Richard Peter
99c550709e Omaha #3274 Tweak G1 Flags for Cave
Change-Id: I7d8ac93f2a245ff35261b2f98f997d201495c4f6

Former-commit-id: 1a472d4b2e [formerly 6bc89f2420] [formerly 46f42687e2] [formerly 1a472d4b2e [formerly 6bc89f2420] [formerly 46f42687e2] [formerly 56389ef395 [formerly 46f42687e2 [formerly e16fd779239a09735d6ea092058a39bc7263b2f1]]]]
Former-commit-id: 56389ef395
Former-commit-id: bcf92a4b08 [formerly 2d18721bd6] [formerly 395291351cc63f90d7019e4eb6186c1ef830f36e [formerly 5112bbb8d5]]
Former-commit-id: 40b5d58c95a8b7c0f6129a2b1c88baa2f6af8cdf [formerly c5003ff6c4]
Former-commit-id: 7daa1ed24b
2014-06-26 17:46:57 -05:00
Nate Jensen
3c62a1a906 Omaha #3274 switch viz to G1 garbage collector
Change-Id: I720c4ebb21bd3a37dcc71f8879bb96edb6a0b109

Former-commit-id: 172777137a [formerly 14a520dbd9] [formerly 4a91c3320b] [formerly 172777137a [formerly 14a520dbd9] [formerly 4a91c3320b] [formerly 44cb0e6ae6 [formerly 4a91c3320b [formerly 0355813f030ac996427c64dfcb6cbd4dd781ad2f]]]]
Former-commit-id: 44cb0e6ae6
Former-commit-id: a115e851fb [formerly 439e037d03] [formerly a3713f79ee49f1e6f01c9ebf4f56ac3cf08b2e8c [formerly 3981241355]]
Former-commit-id: b6228cb159c4073552fff5ecb789b070f81770b9 [formerly fe47ecf6ce]
Former-commit-id: 54b72c7108
2014-06-17 10:54:57 -05:00
Ron Anderson
be71fd9775 Issue #2909 Remove useLegacyMergeSort java parameter
Change-Id: Id95bad1eebc602b5822ee8a69e18058f0dea266a

Former-commit-id: 010666a971 [formerly f921b5c83b] [formerly d1b36c4a72] [formerly 010666a971 [formerly f921b5c83b] [formerly d1b36c4a72] [formerly dd8bfdf941 [formerly d1b36c4a72 [formerly 3aeb50672f8de7b973f234e0ab351416cbf7670b]]]]
Former-commit-id: dd8bfdf941
Former-commit-id: 291504f08d [formerly f24f542137] [formerly 4689925288bb72398ed1efadbc5c3d15c54a177e [formerly b82cf065b5]]
Former-commit-id: 7aa1d3987df5be30748307db9529f5d2a21672a4 [formerly 2bf7b94fe4]
Former-commit-id: 1ed943032d
2014-03-13 11:54:15 -05:00
Ben Steffensmeier
0b48d33f0b Issue #2791 Move D2D Grids to direct memory.
Former-commit-id: 6dc44e895f [formerly fd34cf3993] [formerly 12ed63619a] [formerly 6dc44e895f [formerly fd34cf3993] [formerly 12ed63619a] [formerly 775c29e77c [formerly 12ed63619a [formerly 8d8a06be12652349032f15ab1e31d5f23adf0b24]]]]
Former-commit-id: 775c29e77c
Former-commit-id: ceb056d304 [formerly 2bc8805fbc] [formerly e70e825d566372eb4b060f189bea9a1c2b022f0d [formerly a06a98750f]]
Former-commit-id: a89a30db3acd3cf5e17ecb35b2b039bc72f90b99 [formerly 3f62075baa]
Former-commit-id: ab265087eb
2014-03-05 14:57:28 -06:00
Greg Armendariz
39205171d5 Issue #2754 - Remove extra character
Former-commit-id: ddf3e9785f [formerly 6ff868a167] [formerly 9cc089b369] [formerly ddf3e9785f [formerly 6ff868a167] [formerly 9cc089b369] [formerly 1017abdc78 [formerly 9cc089b369 [formerly 5979ad555987210e07e32eb5336e7cb427ac06c3]]]]
Former-commit-id: 1017abdc78
Former-commit-id: fc4ce60ce6 [formerly 4e092b5810] [formerly 36e64f6fb42a953ef4b064e4d83069bf3fb501c5 [formerly a8c75ce81e]]
Former-commit-id: d3680183f6f2eff66c7a3c57056faca6d68e32be [formerly b37096a395]
Former-commit-id: 91d14d6f32
2014-01-29 08:43:09 -06:00
Steve Harris
0a5772e795 Merge branch 'omaha_14.2.1' into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	cave/com.raytheon.viz.product.awips/awips.product
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java

Former-commit-id: 56f5ae9f48 [formerly a465718a0d] [formerly 24ab7cff49] [formerly 56f5ae9f48 [formerly a465718a0d] [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 24ab7cff49 [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]]]
Former-commit-id: 69dc3d835b
Former-commit-id: 6cb92b1f57 [formerly b62efa9387] [formerly 24faa7a52a1fc22725c96c64ac33b0850b177a02 [formerly 252c7ee40a]]
Former-commit-id: 800d6b432a0b97ae5f3b770d37e08ca17eb7e05a [formerly 2a967fc9b5]
Former-commit-id: 69626ab704
2014-01-21 12:36:54 -06:00
Ron Anderson
643c0819b1 Issue #2717 Force use of legacy merge sort
Change-Id: Ic37aa4af53f18cc1cbe9bd23420cb692dfa300d7

Former-commit-id: a481848c67 [formerly 34d1b95a79] [formerly de97ec032f] [formerly a481848c67 [formerly 34d1b95a79] [formerly de97ec032f] [formerly 66bbc99784 [formerly de97ec032f [formerly df2af35f3c54b30915cdb6ccebaa30c0e05c7725]]]]
Former-commit-id: 66bbc99784
Former-commit-id: 9b8c8310ab [formerly 0048ef6a96] [formerly c83a8b6d3a8111365ba2ad52fdb151f0a5cec621 [formerly 61d8aec23c]]
Former-commit-id: 52bde166e586e19680a1aa9f75a55d0e29557a25 [formerly 841504f145]
Former-commit-id: 385547a5e5
2014-01-20 17:22:26 -06:00
Brian Clements
5754f15da4 Issue #2594 added low memory warning job
UiPlugin starts and stops job
job notifies perspective manager of low memory
Viz perspective manager has default alert implementation
D2D and GFE override alert message
added memory threshold property to product files


Former-commit-id: 8d6a469928 [formerly c63c8e2fc6] [formerly f9a8b68da5] [formerly 8d6a469928 [formerly c63c8e2fc6] [formerly f9a8b68da5] [formerly 0076ec9aaf [formerly f9a8b68da5 [formerly 4af42d405d3bf24b00c027f5dab8faf500a9e5b7]]]]
Former-commit-id: 0076ec9aaf
Former-commit-id: d53024b73f [formerly 496d15d77f] [formerly 99fc908864fba07455340f77fae46faf16981fcf [formerly e420ae009d]]
Former-commit-id: a57d8088ab7dc4c9a4fed5bd5802e7dfc0a73d06 [formerly dd0c5d9b57]
Former-commit-id: db92ac5b84
2014-01-14 17:05:28 -06:00
Brian Clements
90a3d24bc8 Issue #2594 made heap status monitor default on launch
Former-commit-id: 3333d3b926 [formerly 4f37164fc5] [formerly 6ba1eb0edb] [formerly 3333d3b926 [formerly 4f37164fc5] [formerly 6ba1eb0edb] [formerly 4a62eb90dc [formerly 6ba1eb0edb [formerly 1ba7ebb59e28ba93bb752c32ffce937a4455d478]]]]
Former-commit-id: 4a62eb90dc
Former-commit-id: 42e259b83c [formerly cde78c4006] [formerly 0c8dc064b7186b1457f6e9bd47835cc2ba812b79 [formerly 3d196a00dd]]
Former-commit-id: c6d65642a6421b3b4a0827e21218f439ea9ec7d8 [formerly 5ab028fbe4]
Former-commit-id: c3e6c9501d
2014-01-10 14:54:14 -06:00
Max Schenkelberg
17c77a8cdc Issue #2211 Reverted changes for SS DR 16070 and fixed satellite sampling as percentage
Amend: Added jgerth comment history back in

Change-Id: I08733fcf46f9bdcded1f609bcdd26459652edaef

Former-commit-id: 9d590ce7f9 [formerly 7f4b63283d] [formerly dda69d36b7] [formerly 9d590ce7f9 [formerly 7f4b63283d] [formerly dda69d36b7] [formerly a18686135c [formerly dda69d36b7 [formerly 2e52921b21ecaeaa11be8277e264446686d65338]]]]
Former-commit-id: a18686135c
Former-commit-id: b5b121032d [formerly 23b6e68e14] [formerly 627430677d858453f22a1a0fc99838be1d3e97bc [formerly 75ae62fd9a]]
Former-commit-id: 9c925a779c5403a930ff676af34fb0919f7d79fd [formerly 3d5f35d792]
Former-commit-id: a691c86dc0
2013-08-06 12:37:52 -05:00
Nate Jensen
bc564392d1 Issue #2142 logback cleanup
Change-Id: I48716f940fd2c8545d372bd16d881f87a75311f1

Former-commit-id: 9c575f1754 [formerly 621a4da9b7] [formerly 81d9a28d53] [formerly 9c575f1754 [formerly 621a4da9b7] [formerly 81d9a28d53] [formerly a0aeeedd23 [formerly 81d9a28d53 [formerly 38ee29e206824a1beeaad5837d731804b4affbdc]]]]
Former-commit-id: a0aeeedd23
Former-commit-id: 8b409d373f [formerly 5c123e60d8] [formerly 7e6549f719edb3018a4fa8735433e50b1367bd15 [formerly 447ac6311d]]
Former-commit-id: 71620ec8729f783f4d97d16161fe2bd5dd0c1285 [formerly 6d8c46e6d6]
Former-commit-id: 2a28bb772b
2013-07-17 14:03:43 -05:00
Max Schenkelberg
ad32bbd91d Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties

Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa

Former-commit-id: cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]]
Former-commit-id: 50825200a1
Former-commit-id: f025c05d04 [formerly d1881ffa51] [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]]
Former-commit-id: a38fe0e4cd744ea32b4c88e97305cabc3dbac06f [formerly a47f187f4f]
Former-commit-id: 5ba50b4476
2013-07-15 14:26:15 -05:00
Nate Jensen
4f6c84f9bb Issue #2142 initial cutover from log4j to SLF4J and logback
Change-Id: I6953739821992fadb2b92da0dc659512b90a5895

Former-commit-id: 338b0ae310 [formerly a4de603bcf] [formerly 316d6c09c6] [formerly 338b0ae310 [formerly a4de603bcf] [formerly 316d6c09c6] [formerly db6152e524 [formerly 316d6c09c6 [formerly 7725d8a6cd00b3c30856b48ef86ab081b67d400b]]]]
Former-commit-id: db6152e524
Former-commit-id: cce5d8e8ff [formerly 5a6b0f99cc] [formerly 2c4eb0e65e048d5b4c2a5c36ff3eca32312ad167 [formerly 6da64f329c]]
Former-commit-id: dedb130eb36dca918cdf2169d1ec2f249f45f829 [formerly efcf0c8519]
Former-commit-id: 86b096bc9b
2013-07-01 14:41:05 -05:00
Nate Jensen
d045893591 Issue #2102 improve error handling on thrift or http errors
Change-Id: I6b2cad4c2a73eb436354012838423d8ba02f2c6b

Former-commit-id: a7573825c6 [formerly f55b3cbdbe] [formerly c2faa0e3bf] [formerly a7573825c6 [formerly f55b3cbdbe] [formerly c2faa0e3bf] [formerly 0f6d897ff3 [formerly c2faa0e3bf [formerly c38fb601bf4a360ab171e4d04f242e99f91710f2]]]]
Former-commit-id: 0f6d897ff3
Former-commit-id: f173cc29e1 [formerly 4a39d586d2] [formerly 2c28ccce1da59ab7ab0b89fdd9a246a15d2ec710 [formerly 2200c7cded]]
Former-commit-id: 68961429c50b354dfaec2ba5f64aea79e2210876 [formerly 853f5c7546]
Former-commit-id: c5d88a6dce
2013-06-13 11:39:30 -05:00
Steve Harris
97a4c59662 13.5.1-1 baseline
Former-commit-id: 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly 5d99df9969 [formerly 6384018950] [formerly 998961612c] [formerly fe872355a7 [formerly 998961612c [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]]]]
Former-commit-id: fe872355a7
Former-commit-id: 43b7a9b410 [formerly 0aab285b8a] [formerly 7fa801e313a1348e6bb00da11f43928fdf179b69 [formerly 30ba1d634e]]
Former-commit-id: 83a711e54bdd8cabc147e6ca5222939082f46f9c [formerly 146c5e8940]
Former-commit-id: 859965fc9d
2013-06-10 15:17:17 -04:00
Steve Harris
a2c35a5f3f 13.4.1-7 baseline
Former-commit-id: 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 81bc07bff4 [formerly 8072752c77] [formerly 4c6ff79e71] [formerly 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]]]
Former-commit-id: 8347bed50e
Former-commit-id: 6e1e454a9f [formerly ff7a21ac37] [formerly f3152ba9f38327cd1d37f2849c62a4d8c8652434 [formerly b35027f661]]
Former-commit-id: fa4cea9874a8ab4f41eefd7e3ce4a2ea2b2883b4 [formerly dffa6d3bdc]
Former-commit-id: c7c6ea343e
2013-05-13 12:58:10 -04:00
Steve Harris
fd735b8ff8 13.3.1-12 baseline
Former-commit-id: 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly 6f374b35d0 [formerly be96282207] [formerly 0be473728a] [formerly aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]]]
Former-commit-id: aaac0b51e5
Former-commit-id: bb30a41300 [formerly f80f98cee2] [formerly 4cfa5d11d7d7059b88534daa18142d24f3a6f481 [formerly bc439aee4f]]
Former-commit-id: 5c941816ce99cd7acc86ec8198a9c8d060f02007 [formerly f1d156779a]
Former-commit-id: 120fc26670
2013-03-25 13:27:13 -05:00
Steve Harris
352658125b 13.3.1-7 baseline
Former-commit-id: 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly 23faf84455 [formerly 97d2f521e4] [formerly a72254cc75] [formerly e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]]]
Former-commit-id: e12ed113ae
Former-commit-id: 45a2d0501d [formerly ed5f1dbab6] [formerly d299d49a18ce894ac93ab2f7c3535d2ed60e4151 [formerly 31c0a97dca]]
Former-commit-id: 096ac88075679da8529975d1e43734a1aba18a81 [formerly 3084a860cd]
Former-commit-id: 88b28c39c1
2013-03-13 09:50:28 -05:00
Steve Harris
745f2c6409 13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
2013-01-06 14:32:24 -06:00
Steve Harris
8794e3b599 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
2012-10-16 13:27:07 -05:00
Steven Harris
db663faca9 12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly ffe3641057 [formerly 0e86bfd1d3] [formerly 618aa3f316] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77 [formerly f5e63d5f93] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83]
Former-commit-id: 2f855322f6
2012-09-27 15:57:45 -05:00
Steve Harris
46068c6716 12.5.1-15 baseline
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c]
Former-commit-id: 39ff9954f8
2012-06-08 13:39:48 -05:00
Steve Harris
5b35d8a6e0 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Ben Steffensmeier
70e6e0c580 Issue #352 initialize ThinClientDataUpdateTree as soon as component starts to ensure that it correctly sets the last query time.
Change-Id: I13d4af0a1529e31f78e998db6bbdee228e749e1f

Former-commit-id: 7c3545170d [formerly 3713d7a181] [formerly 5dee50e7e9] [formerly 7c3545170d [formerly 3713d7a181] [formerly 5dee50e7e9] [formerly d7a63995f1 [formerly 5dee50e7e9 [formerly d05beaa84618bc01d8cb711298523dc358bb4938]]]]
Former-commit-id: d7a63995f1
Former-commit-id: 1ac84dc230 [formerly dba810ddc4] [formerly 17cbace4358ff60cc55095422d0870a3cb6e704b [formerly e52c2ffb20]]
Former-commit-id: b1cbf0e1d3e7d64bdf7e7eb29373c28474ccbf6b [formerly 7d4367ee7a]
Former-commit-id: f668495c76
2012-02-28 15:20:37 -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
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
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
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