Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Thu, 6 Oct 2011 00:34:11 +0000 (02:34 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Thu, 6 Oct 2011 00:34:11 +0000 (02:34 +0200)

Trivial merge