Merge branch 'master' of ssh://git.onelab.eu/git/myplc
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 7 Sep 2011 08:48:14 +0000 (10:48 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 7 Sep 2011 08:48:14 +0000 (10:48 +0200)

Trivial merge