Merge some improvements towards 1.7 support.
authorJelmer Vernooij <jelmer@samba.org>
Wed, 29 Feb 2012 10:17:25 +0000 (11:17 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 29 Feb 2012 10:17:25 +0000 (11:17 +0100)
1  2 
setup.py

diff --cc setup.py
Simple merge