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.