Merge branch 'thgeneric' of ssh://git.onelab.eu/git/sfa into thgeneric
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 3 Nov 2011 16:09:39 +0000 (17:09 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 3 Nov 2011 16:09:39 +0000 (17:09 +0100)

Trivial merge