Wed, 17 Oct 2012 17:19:48 +0200 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 17 Oct 2012 17:19:48 +0200] rev 1146
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 tip