with fixing (trivial) conflicts in:
	src/lib/dns/python/Makefile.am
	src/lib/dns/python/tsigerror_python.cc
Also moved tsigerror_python_inc.cc to EXTRA_DIST because it doesn't have
to be compiled separately.