Merge branch 'senslab2'
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 29 Jan 2013 16:28:51 +0000 (17:28 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Tue, 29 Jan 2013 16:28:51 +0000 (17:28 +0100)

Trivial merge