Apply changes of a tree conflict with: r71463 | lrineau | 2012-08-22 14:35:03 +0200 (Wed, 22 Aug 2012)