Thu, 04 Oct 2012 15:10:45 +0100Merge
Mario de Sousa <msousa@fe.up.pt> [Thu, 04 Oct 2012 15:10:45 +0100] rev 667
Merge