Wed, 09 May 2012 23:04:03 +0100Merge changes.
mjsousa <msousa@fe.up.pt> [Wed, 09 May 2012 23:04:03 +0100] rev 548
Merge changes.