Tue, 05 Apr 2011 17:12:12 +0100merging the Edouard's version.
Mario de Sousa <msousa@fe.up.pt> [Tue, 05 Apr 2011 17:12:12 +0100] rev 282
merging the Edouard's version.