Merge branch 'master' of ssh://git.onelab.eu/git/plewww
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 9 Nov 2011 14:50:36 +0000 (15:50 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 9 Nov 2011 14:50:36 +0000 (15:50 +0100)

Trivial merge