Wed, 02 Dec 2009 19:42:07 +0100 Edouard TISSERANT merge