Fri, 03 Feb 2012 17:20:50 +0100 Merge with upstream
hamidouk [Fri, 03 Feb 2012 17:20:50 +0100] rev 526
Merge with upstream
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip