Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 10:41:50 +0000 (20:41 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 10:41:50 +0000 (20:41 +1000)
commitb4b14b748e6babc93faee23fe8f5c03ec2d25cbb
treeba0b5b82464fb691fa437ab2e1a1a69bf6511d73
parentc7c32ec7b42bdf0f7b669644516438c71b364e60
parentd548f5dee5980eae0aea25f1314238eb4f963568
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet