Sat, 31 Mar 2012 21:46:37 +0100merging with Lauren't changeset.
Mario de Sousa <msousa@fe.up.pt> [Sat, 31 Mar 2012 21:46:37 +0100] rev 500
merging with Lauren't changeset.

Sat, 31 Mar 2012 21:36:17 +0100merge with Laurent's changeset (essentially ignore all changes).
Mario de Sousa <msousa@fe.up.pt> [Sat, 31 Mar 2012 21:36:17 +0100] rev 499
merge with Laurent's changeset (essentially ignore all changes).