Fri, 06 Apr 2012 22:53:24 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Fri, 06 Apr 2012 22:53:24 +0200] rev 1064
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip