BIND 10 trac1750-merged, created. 1e7034236255fb73195cb5599253054487c16543 Merge #1750

[BIND 10 source code commits]

The branch, trac1750-merged has been created
        at  1e7034236255fb73195cb5599253054487c16543 (commit)

- Log -----------------------------------------------------------------
commit 1e7034236255fb73195cb5599253054487c16543
Merge: f93cd951e3ead684e4efbc8d2eaa523141e0cf65 ed2d49029b003ba8dab938ba015270a17f4b203c
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Wed Apr 18 11:29:16 2012 +0200

    Merge #1750
    
    Conflicts:
    	src/bin/auth/tests/query_unittest.cc
    	src/lib/datasrc/memory_datasrc.cc

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