Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Sun, 25 Sep 2011 20:26:46 +0000 (22:26 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Sun, 25 Sep 2011 20:26:46 +0000 (22:26 +0200)

Trivial merge