Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 25 May 2011 15:48:27 +0000 (17:48 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 25 May 2011 15:48:27 +0000 (17:48 +0200)
commit56be1dfd78b24aba3e475e3f09dda4e3eb861bd6
treee0feae648c00b3fe3b94f492e7308c6b8d10413d
parentcc5a7e83ec52d5ce24ecc9d1242179e0602710ee
parent497b7be348872efd00a41929825043b2dc2012c9
Merge with head