Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 19 Oct 2011 07:17:46 +0000 (09:17 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 19 Oct 2011 07:17:46 +0000 (09:17 +0200)

Trivial merge