Merge branch 'master' of ssh://git.onelab.eu/git/plcapi
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 18 Nov 2010 09:23:33 +0000 (10:23 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 18 Nov 2010 09:23:33 +0000 (10:23 +0100)

Trivial merge