merged trunk@3240 changes into this branch
git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac292@3248 e5f2f494-b856-4b98-b285-d166d9295462
This diff is collapsed.
git-svn-id: svn://bind10.isc.org/svn/bind10/branches/trac292@3248 e5f2f494-b856-4b98-b285-d166d9295462