Wed, 01 Feb 2012 13:01:08 +0000Merging with Laurent's repository.
Mario de Sousa <msousa@fe.up.pt> [Wed, 01 Feb 2012 13:01:08 +0000] rev 416
Merging with Laurent's repository.