Wed, 28 Nov 2012 23:59:39 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Wed, 28 Nov 2012 23:59:39 +0000] rev 1167
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 tip