Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 4 Oct 2011 07:30:12 +0000 (09:30 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 4 Oct 2011 07:30:12 +0000 (09:30 +0200)

Trivial merge