Wed, 04 Apr 2012 09:31:47 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 04 Apr 2012 09:31:47 +0200] rev 1062
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip