Wed, 29 Aug 2012 21:52:33 +0100Merge.
Mario de Sousa <msousa@fe.up.pt> [Wed, 29 Aug 2012 21:52:33 +0100] rev 644
Merge.