merge with head
authorAlina Quereilhac <alina.quereilhac@inria.fr>
Thu, 18 Aug 2011 12:33:36 +0000 (14:33 +0200)
committerAlina Quereilhac <alina.quereilhac@inria.fr>
Thu, 18 Aug 2011 12:33:36 +0000 (14:33 +0200)

Trivial merge