merge.
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Thu, 25 Aug 2011 11:22:29 +0000 (13:22 +0200)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Thu, 25 Aug 2011 11:22:29 +0000 (13:22 +0200)

Trivial merge