Thu, 02 Feb 2012 16:12:46 +0100 Merge with upstream
hamidouk [Thu, 02 Feb 2012 16:12:46 +0100] rev 513
Merge with upstream
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 tip