Sun, 13 May 2012 14:39:47 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 13 May 2012 14:39:47 +0100] rev 1074
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 tip