Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 27 Jul 2011 14:01:38 +0000 (16:01 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 27 Jul 2011 14:01:38 +0000 (16:01 +0200)

Trivial merge