Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 16 Dec 2010 22:48:14 +0000 (23:48 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 16 Dec 2010 22:48:14 +0000 (23:48 +0100)

Trivial merge