Wed, 02 May 2012 13:20:06 +0200 merge with stable
Martin Geisler <mg@aragost.com> [Wed, 02 May 2012 13:20:06 +0200] rev 16569
merge with stable
(0) -10000 -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip