Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
commitc21dd40bc73acafe6bd28cfd0de60f2a4b03853a
authorAndrew Bartlett <abartlet@samba.org>
Tue, 6 May 2008 22:12:16 +0000 (7 08:12 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 6 May 2008 22:12:16 +0000 (7 08:12 +1000)
treebc78486faf28964d77ba47415ad07c7a2f673e36
parent5f36a605a9accfba1125bbae0e79bb14b936173c
parent334d76c3559870bd9dc9ef55c9b1a7ce21ee9d4c
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local