Sun, 20 Nov 2011 19:36:48 +0000 Mario de Sousa Merging with Laurent's repository.