Merge branch 'master' of ssh://git.onelab.eu/git/sfa
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 26 Oct 2010 11:29:50 +0000 (13:29 +0200)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Tue, 26 Oct 2010 11:29:50 +0000 (13:29 +0200)

Trivial merge