Tue, 17 May 2011 10:35:12 +0100Merging with Edouard's changes
Mario de Sousa <msousa@fe.up.pt> [Tue, 17 May 2011 10:35:12 +0100] rev 299
Merging with Edouard's changes