Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 15 Dec 2010 15:55:43 +0000 (16:55 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Wed, 15 Dec 2010 15:55:43 +0000 (16:55 +0100)

Trivial merge