Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Fri, 26 Aug 2011 15:58:33 +0000 (17:58 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Fri, 26 Aug 2011 15:58:33 +0000 (17:58 +0200)

Trivial merge