# HG changeset patch
# User Mario de Sousa <msousa@fe.up.pt>
# Date 1333226177 -3600
# Node ID 58d0c3b3c53b74acf4e6aa48a8a9ffab0b597e74
# Parent  0637a4490c8cf14454ce346ef81713a5d19cd009# Parent  2d77f0f7777345f21b757d01a78b465c49667fc4
merge with Laurent's changeset (essentially ignore all changes).