Merge branch 'master' into v7
authorLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 16 Nov 2012 09:24:16 +0000 (10:24 +0100)
committerLudovic CHEVALIER <ludovic.chevalier@heureux-cyclage.org>
Fri, 16 Nov 2012 09:24:16 +0000 (10:24 +0100)

Trivial merge