Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Sat, 1 Oct 2011 18:26:31 +0000 (20:26 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Sat, 1 Oct 2011 18:26:31 +0000 (20:26 +0200)

Trivial merge