Sat, 23 Mar 2013 14:43:30 +0000 Merge with stable
Christian Ebert <blacktrash@gmx.net> [Sat, 23 Mar 2013 14:43:30 +0000] rev 1220
Merge with stable
(0) -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 tip