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 11:16:40 +0000 (21:16 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 11:16:40 +0000 (21:16 +1000)
commitfa03d750e4577a610dc410d45d49789110b1b4f1
treee7b43712d9e4fdf6e00bae3bb33256f459d2813f
parente85abe7db21eec47adecae8243a25f145aa7ec9a
parentb4b14b748e6babc93faee23fe8f5c03ec2d25cbb
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet