merged changes from 0.9.6.10
authorStefan Behnel <scoder@users.berlios.de>
Sat, 29 Dec 2007 21:49:36 +0000 (22:49 +0100)
committerStefan Behnel <scoder@users.berlios.de>
Sat, 29 Dec 2007 21:49:36 +0000 (22:49 +0100)
1  2 
setup.py

diff --cc setup.py
Simple merge