Merge branch 'geni-v2' of ssh://git.onelab.eu/git/sfa into geni-v2
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 28 Nov 2012 15:23:50 +0000 (16:23 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Wed, 28 Nov 2012 15:23:50 +0000 (16:23 +0100)

Trivial merge