Merging with head
authorClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Fri, 27 May 2011 13:47:57 +0000 (15:47 +0200)
committerClaudio-Daniel Freire <claudio-daniel.freire@inria.fr>
Fri, 27 May 2011 13:47:57 +0000 (15:47 +0200)
commit3ac0cad13d7cba5617ce7b3b2b3fc8a6e169081d
tree21fa0d49fafb4ef0489c0e91fc431938451f352a
parentef1d3e9e374badb09650c15af3af7b00658fa427
parent88b563bf316fa151152c477cb5ee3e9a809a60d2
Merging with head
setup.py