Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 30 Jan 2013 14:19:39 +0000 (15:19 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 30 Jan 2013 14:19:39 +0000 (15:19 +0100)

Trivial merge