merge

2009-12-16, Edouard TISSERANT