Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 24 Aug 2011 10:28:41 +0000 (12:28 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 24 Aug 2011 10:28:41 +0000 (12:28 +0200)

Trivial merge