Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 9 Aug 2011 15:44:14 +0000 (17:44 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 9 Aug 2011 15:44:14 +0000 (17:44 +0200)
commite1cea30060f499111e893b290557faa42908cf78
treea329274979242773806da1e4411803ed89805ba5
parent47e7024b4c75a1bba05eecdf404bb271cb841f46
parent48f8657f6e8e5c52df45b067928860541f7598d9
Merge with head