Thu, 22 Nov 2012 19:19:48 +0000merge
Mario de Sousa <msousa@fe.up.pt> [Thu, 22 Nov 2012 19:19:48 +0000] rev 744
merge