Merge branch 'master' of ssh://git.onelab.eu/git/tests
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 7 Jan 2011 11:47:09 +0000 (12:47 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Fri, 7 Jan 2011 11:47:09 +0000 (12:47 +0100)

Trivial merge