Fri, 19 Aug 2011 20:48:05 +0100 Mario de Sousa Merging with Laurent's repository.