Merge branch 'master' of ssh://git.onelab.eu/git/myplc
Thierry Parmentelat [Mon, 4 Oct 2010 12:33:43 +0000 (14:33 +0200)]

Trivial merge