Wed, 01 Feb 2012 13:01:08 +0000 Mario de Sousa Merging with Laurent's repository.