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

Trivial merge