Mon, 06 Feb 2012 16:03:56 +0100 Merge with upstream
hamidouk [Mon, 06 Feb 2012 16:03:56 +0100] rev 537
Merge with upstream
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 tip