Merge branch 'master' of ssh://git.onelab.eu/git/myplc
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 30 Mar 2011 03:09:40 +0000 (05:09 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 30 Mar 2011 03:09:40 +0000 (05:09 +0200)

Trivial merge