Mon, 11 Jul 2011 09:47:27 +0100 Mario de Sousa commiting merge with Laurent's repository