Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 21 May 2008 02:13:45 +0000 (12:13 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 21 May 2008 02:13:45 +0000 (12:13 +1000)
commitfdec7fdaf5d4150e14311d9b3bb2da7358a407ff
tree5fbeb5de11214711f780e69c5e9ad1210c2e861e
parent2f773ff347ec2828f94f4980a3aedbde37009737
parent6d4424cd45333c3029b0272528485dd2b3f8e620
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 7594f79db6a0e8a46e2863829e5e050b03dfaec1)