Sat, 31 Mar 2012 17:14:32 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 31 Mar 2012 17:14:32 +0100] rev 1054
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip