Merge with tip
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 26 Jul 2011 16:24:29 +0000 (18:24 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 26 Jul 2011 16:24:29 +0000 (18:24 +0200)

Trivial merge