Merge branch 'master' into v7
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Mon, 19 Nov 2012 08:12:01 +0000 (09:12 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Mon, 19 Nov 2012 08:12:01 +0000 (09:12 +0100)

Trivial merge