Thu, 31 Mar 2011 10:45:34 +0100Merging my Huge change with Edouards/Laurents version
Mario de Sousa <msousa@fe.up.pt> [Thu, 31 Mar 2011 10:45:34 +0100] rev 258
Merging my Huge change with Edouards/Laurents version