Merge branch 'master' into senslab2
authorThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 10 Nov 2011 14:40:23 +0000 (15:40 +0100)
committerThierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Thu, 10 Nov 2011 14:40:23 +0000 (15:40 +0100)

Trivial merge