Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 10 Apr 2013 09:42:11 +0000 (11:42 +0200)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 10 Apr 2013 09:42:11 +0000 (11:42 +0200)

Trivial merge