Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Thu, 17 Apr 2008 12:25:22 +0000 (14:25 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 17 Apr 2008 12:25:22 +0000 (14:25 +0200)
commit8d9812bada2801f93eb47270287b3c083a3e9df8
treee95edec0c17179c22aed82a8df5e87999b6bf6fa
parent12fa30765361ed9b2e80951baa739ae4aba3fffe
parent3f46eb95e47828ba1db236d584933c997cb0c170
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet