Thu, 29 Mar 2012 18:57:53 +0100merging with Laurent's patch.
Mario de Sousa <msousa@fe.up.pt> [Thu, 29 Mar 2012 18:57:53 +0100] rev 493
merging with Laurent's patch.