Sat, 31 Mar 2012 15:30:38 +0100merging with Laurent's revision 55b074ea7255 (essentially ignoring all changes)
Mario de Sousa <msousa@fe.up.pt> [Sat, 31 Mar 2012 15:30:38 +0100] rev 495
merging with Laurent's revision 55b074ea7255 (essentially ignoring all changes)