Merge default
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 26 Jul 2011 14:58:11 +0000 (16:58 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 26 Jul 2011 14:58:11 +0000 (16:58 +0200)

Trivial merge