Sun, 20 Nov 2011 19:36:48 +0000Merging with Laurent's repository.
Mario de Sousa <msousa@fe.up.pt> [Sun, 20 Nov 2011 19:36:48 +0000] rev 414
Merging with Laurent's repository.