Sat, 28 May 2011 15:16:55 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 28 May 2011 15:16:55 +0100] rev 961
Merge with stable
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip