BIND 10 trac641, created. fdfe3422ffc3d7f6eb44114d02a0a3759d4dee7c [master] changelog for trac #626

[BIND 10 source code commits]

The branch, trac641 has been created
        at  fdfe3422ffc3d7f6eb44114d02a0a3759d4dee7c (commit)

- Log -----------------------------------------------------------------
commit fdfe3422ffc3d7f6eb44114d02a0a3759d4dee7c
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Mar 11 14:36:36 2011 -0800

    [master] changelog for trac #626

commit 721a53160c15e8218f6798309befe940b9597ba0
Merge: 677c3d840612c58d1cd011adb678e464a904f959 c952ddadcd1c0339097009c7cc9015bf33fb81aa
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Fri Mar 11 14:13:24 2011 -0800

    [master] Merge branch 'trac626' with resolvoing conflicts in src/lib/Makefile.am.

commit 677c3d840612c58d1cd011adb678e464a904f959
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Mar 11 20:53:10 2011 +0100

    [master] re-add return to make cppcheck happy
    
    added a comment that at this point this is safe

commit 67bfb6c60061a86dd0420df77d5cb85af935c634
Merge: ec8977f28f7824c8c0b07180eda806be22110199 2e697f95732f976f3ba51a671a0c23d2057f3162
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Mar 11 19:20:02 2011 +0000

    Merge branch 'master' of ssh://bind10.isc.org/var/bind10/git/bind10

commit ec8977f28f7824c8c0b07180eda806be22110199
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Mar 11 19:19:34 2011 +0000

    [master] need clangpp check in lib/resolve too

commit 2e697f95732f976f3ba51a671a0c23d2057f3162
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Mar 11 18:48:39 2011 +0000

    [master] namespace fix (sunstudio)

commit e2c01932a3a51d44a76cdfe7c97bcc14bab8a1cc
Author: jelte <jelte at isc.org>
Date:   Fri Mar 11 17:40:04 2011 +0000

    [master] fix one build issue

commit 19a98f3b7abb7ec47957f9143628174f61e3f590
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Mar 11 16:29:54 2011 +0100

    [master] removed some LDADD deps that are now unneeded

commit 76022a7e9f3ff339f0f9f10049aa85e5784d72c5
Merge: 11889ab357ea40764683e4be03bcc27a4ab6bb04 454739d105be01d7b9711038ca68271d0f4fd02c
Author: Jelte Jansen <jelte at isc.org>
Date:   Fri Mar 11 16:11:46 2011 +0100

    [master] Merge branch 'trac495'
    
    Conflicts:
    	src/lib/Makefile.am
    	src/lib/asiolink/Makefile.am
    	src/lib/asiolink/tcp_socket.h
    	src/lib/asiolink/tests/Makefile.am
    	src/lib/nsas/asiolink.h
    	src/lib/resolve/recursive_query.cc

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