Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 28 Sep 2011 12:05:32 +0000 (14:05 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 28 Sep 2011 12:05:32 +0000 (14:05 +0200)

Trivial merge