Sat, 12 Mar 2011 13:19:55 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 12 Mar 2011 13:19:55 +0100] rev 891
Merge with stable
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip