Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Thu, 4 Aug 2011 11:24:39 +0000 (13:24 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Thu, 4 Aug 2011 11:24:39 +0000 (13:24 +0200)

Trivial merge