Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 5 Dec 2011 14:58:52 +0000 (15:58 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Mon, 5 Dec 2011 14:58:52 +0000 (15:58 +0100)

Trivial merge