Merge branch 'master' of ssh://git.onelab.eu/git/myplc
Thierry Parmentelat [Wed, 30 Mar 2011 03:09:40 +0000 (05:09 +0200)]

Trivial merge