Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 6 Jul 2011 15:22:54 +0000 (17:22 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Wed, 6 Jul 2011 15:22:54 +0000 (17:22 +0200)
commitbf3408af80db30702aa06b981d7928b40ebae092
tree3774eda79043a45b0002d1706b0d3594ab8ee7cc
parentada632255e0bce7fabe72a738da8d59b1299beeb
parentd7dde31a6fac6fd3283196f81345ccfe209e1fac
Merge with head