merge
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Wed, 16 Apr 2014 15:08:01 +0000 (17:08 +0200)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Wed, 16 Apr 2014 15:08:01 +0000 (17:08 +0200)

Trivial merge