Merge

2009-12-01, Edouard TISSERANT