Merge branch 'master' of ssh://git.onelab.eu/git/build
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Sat, 19 Jan 2013 23:32:19 +0000 (00:32 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Sat, 19 Jan 2013 23:32:19 +0000 (00:32 +0100)

Trivial merge