Mon, 03 Jun 2013 09:59:32 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 03 Jun 2013 09:59:32 +0100] rev 1262
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 tip