Sat, 31 Mar 2012 15:36:08 +0100merging with Laurent's changes.
Mario de Sousa <msousa@fe.up.pt> [Sat, 31 Mar 2012 15:36:08 +0100] rev 497
merging with Laurent's changes.

Sat, 31 Mar 2012 15:34:33 +0100merging with Laurent's change.
Mario de Sousa <msousa@fe.up.pt> [Sat, 31 Mar 2012 15:34:33 +0100] rev 496
merging with Laurent's change.