BIND 10 trac1067, created. 747d2952c78ee32acc485946d3922cfe899a4b48 Merge branch 'work/movesc'

[BIND 10 source code commits]

The branch, trac1067 has been created
        at  747d2952c78ee32acc485946d3922cfe899a4b48 (commit)

- Log -----------------------------------------------------------------
commit 747d2952c78ee32acc485946d3922cfe899a4b48
Merge: f26298e3ae274ccea3d4bcef37f5ac85da383461 dae8a2aabc0cc9c9f3794276676872014c5a58fa
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Aug 4 10:27:56 2011 +0200

    Merge branch 'work/movesc'

commit f26298e3ae274ccea3d4bcef37f5ac85da383461
Merge: c5124556a1a8907a84bb2c2bd1912da0c0aaafcc 7489fa475c3f5963323a6b660e4544e48f45d37c
Author: Jelte Jansen <jelte at isc.org>
Date:   Thu Aug 4 09:36:42 2011 +0200

    [master] Merge branch 'trac1160'
    
    Conflicts:
    	src/lib/dns/rdata/in_1/srv_33.cc

-----------------------------------------------------------------------