Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 24 May 2011 08:26:42 +0000 (10:26 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 24 May 2011 08:26:42 +0000 (10:26 +0200)

Trivial merge