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

Mon, 12 Nov 2012 22:36:55 +0100Be sure to not redefine TRUE and FALSE macros.
Manuele Conti <conti.ma@alice.it> [Mon, 12 Nov 2012 22:36:55 +0100] rev 743
Be sure to not redefine TRUE and FALSE macros.