Wed, 16 Dec 2009 14:53:36 +0100 Edouard TISSERANT merge