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)
commit70d26a9b93ab2e1e6b5fe9787affab80212ec9f7
treea657c36677ae7880b7412b072947829470bc01b7
parent359d13a8594de4efccc29042b013aef7b8777337
parent5c695cef761f99738bedcee1c6bb6ad10b120edc
Merge with tip