Thu, 09 Aug 2012 12:52:34 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Thu, 09 Aug 2012 12:52:34 +0100] rev 1120
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 tip