Fri, 27 May 2011 18:01:54 +0100Merging with Edouard's version
Mario de Sousa <msousa@fe.up.pt> [Fri, 27 May 2011 18:01:54 +0100] rev 303
Merging with Edouard's version