Thu, 31 Mar 2011 10:45:34 +0100 Mario de Sousa Merging my Huge change with Edouards/Laurents version