Merge branch 'master' of ssh://git.onelab.eu/git/myplc
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 19 Nov 2010 15:09:13 +0000 (16:09 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 19 Nov 2010 15:09:13 +0000 (16:09 +0100)

Trivial merge