Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 28 May 2008 10:03:56 +0000 (20:03 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 28 May 2008 10:03:56 +0000 (20:03 +1000)
commitb023ca3e9da21dda21b8242e02778fb8ff4605eb
treebc2778300890bf09b9f5aea1e76fad5a628eb6bf
parent28158eb6eae0095eafade1fd0e4bed8fb45397be
parent91069754f8f60e2ade0f907c4420e01125405919
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit ad7f05fd94a19ebae678c733077c59fcea66e5ad)