From: Bob Halley <halley@nominum.com>
Date: Wed, 27 Jan 2010 00:54:36 +0000 (-0800)
Subject: Merge branch 'master' into python3
X-Git-Tag: v1.10.0-py3~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aab377776dfe420441068c5659191254db535dc5;p=thirdparty%2Fdnspython.git

Merge branch 'master' into python3
---

aab377776dfe420441068c5659191254db535dc5