Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 1 Feb 2013 20:57:59 +0000 (21:57 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 1 Feb 2013 20:57:59 +0000 (21:57 +0100)

Trivial merge