Fri, 19 Aug 2011 20:48:05 +0100Merging with Laurent's repository.
Mario de Sousa <msousa@fe.up.pt> [Fri, 19 Aug 2011 20:48:05 +0100] rev 355
Merging with Laurent's repository.