Mon, 23 Jan 2012 16:21:12 +0100 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Mon, 23 Jan 2012 16:21:12 +0100] rev 1047
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip