Merge git+ssh://people.freedesktop.org/home/smcv/public_html/git/dbus-python/