[2380merge2] Merge branch 'trac2380' into trac2380merge2

author Jelte Jansen <jelte@isc.org>

Wed, 19 Dec 2012 09:40:01 +0000 (10:40 +0100)

committer Jelte Jansen <jelte@isc.org>

Wed, 19 Dec 2012 09:40:01 +0000 (10:40 +0100)
author Jelte Jansen <jelte@isc.org>
Wed, 19 Dec 2012 09:40:01 +0000 (10:40 +0100)
committer Jelte Jansen <jelte@isc.org>
Wed, 19 Dec 2012 09:40:01 +0000 (10:40 +0100)
diff --cc src/lib/python/isc/datasrc/tests/Makefile.am
Simple merge
author	Jelte Jansen <jelte@isc.org>
	Wed, 19 Dec 2012 09:40:01 +0000 (10:40 +0100)
committer	Jelte Jansen <jelte@isc.org>
	Wed, 19 Dec 2012 09:40:01 +0000 (10:40 +0100)