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)
commit37a77fc5e5b13cf5b0f6b2fe07e8587dc882c370
tree79ff5531c90f5971bd276bea809ab05df234fcc5
parent93a6ac7f55a4c9e0768131448b18e8622f3bade4
parent49ea7b3b3dc6fa1606a86398278c935a64657b8c
Merge with head