Sun, 01 May 2011 18:18:31 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sun, 01 May 2011 18:18:31 +0100] rev 927
Merge with stable
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip