Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 18 Jan 2013 07:44:40 +0000 (08:44 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Fri, 18 Jan 2013 07:44:40 +0000 (08:44 +0100)

Trivial merge