Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 1 Dec 2010 16:59:16 +0000 (17:59 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 1 Dec 2010 16:59:16 +0000 (17:59 +0100)

Trivial merge