Merge branch 'master' of ssh://git.onelab.eu/git/myplc
Thierry Parmentelat [Wed, 7 Sep 2011 08:48:14 +0000 (10:48 +0200)]

Trivial merge