Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 6 Jul 2011 15:22:54 +0000 (17:22 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 6 Jul 2011 15:22:54 +0000 (17:22 +0200)

Trivial merge