Thu, 16 Jun 2011 11:12:02 +0100Merging with Lauren't recent change.
Mario de Sousa <msousa@fe.up.pt> [Thu, 16 Jun 2011 11:12:02 +0100] rev 325
Merging with Lauren't recent change.

Thu, 16 Jun 2011 11:05:13 +0100Merging two previous commits.
Mario de Sousa <msousa@fe.up.pt> [Thu, 16 Jun 2011 11:05:13 +0100] rev 324
Merging two previous commits.