Thu, 26 Jan 2012 17:27:27 +0100 Merge with upstream
hamidouk [Thu, 26 Jan 2012 17:27:27 +0100] rev 462
Merge with upstream
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 tip