Fri, 18 May 2012 01:21:22 +0100 Merge with default stable
Christian Ebert <blacktrash@gmx.net> [Fri, 18 May 2012 01:21:22 +0100] rev 1076
Merge with default
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 tip