Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Tue, 15 Apr 2008 14:56:15 +0000 (16:56 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 15 Apr 2008 14:56:15 +0000 (16:56 +0200)
commitdfedfae1cd1c1af54609fd56dafe8eb026f9382c
tree7a07bcd46bf711f5ed5ed5d2dd5774f22bf5df94
parentcb5873f36d5f67b51afd9327df114ff7c1b529d0
parent7bb2ebb884c35676a6cf03efe6ecc15b3e232a43
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 66327b8bd8dbde140b93f000a81ba13e743f27b0)