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

Trivial merge