Merge branch 'master' of ssh://git.onelab.eu/git/sfa
Thierry Parmentelat [Tue, 22 May 2012 14:38:01 +0000 (16:38 +0200)]

Trivial merge