Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 14 Sep 2011 04:57:40 +0000 (06:57 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 14 Sep 2011 04:57:40 +0000 (06:57 +0200)

Trivial merge