Wed, 18 May 2011 23:30:45 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 18 May 2011 23:30:45 +0200] rev 952
Merge with stable
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip