Merge with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 24 May 2011 08:26:42 +0000 (10:26 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Tue, 24 May 2011 08:26:42 +0000 (10:26 +0200)
commit0e7419b557b9232de211aec64d43092ddc69c0cb
tree4dd6125e01d438a405680f6a3d282cfeb8fcff7f
parentbee5ffe99c4781222038326ee44ad2b275755035
parentb9a4dd2a6df034a829a0bcf5b3296722e25b64e2
Merge with head