Sun, 15 May 2011 10:22:15 +0100 Mario de Sousa Commiting merge with Laurent's recent dead code removal change.