Fri, 04 Nov 2011 10:31:38 +0100 merge with main stable
Martin Geisler <mg@aragost.com> [Fri, 04 Nov 2011 10:31:38 +0100] rev 15430
merge with main
(0) -10000 -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip