Merge
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 26 Jul 2011 15:07:06 +0000 (17:07 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 26 Jul 2011 15:07:06 +0000 (17:07 +0200)

Trivial merge