Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Mon, 4 Jul 2011 10:59:53 +0000 (12:59 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Mon, 4 Jul 2011 10:59:53 +0000 (12:59 +0200)

Trivial merge