Merge branch 'master' of ssh://git.onelab.eu/git/myplc
Thierry Parmentelat [Tue, 24 May 2011 12:02:25 +0000 (14:02 +0200)]

Trivial merge