Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
commitad7f05fd94a19ebae678c733077c59fcea66e5ad
authorAndrew Bartlett <abartlet@samba.org>
Wed, 28 May 2008 10:03:56 +0000 (28 20:03 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 28 May 2008 10:03:56 +0000 (28 20:03 +1000)
treeac26ebf2163a6c8e934236b4f3869beb7b29d72b
parentd403109666dd31fbaa419d108c386bb2ab01896e
parente957e86a03baa0c0daf3bfe1aaeceb7a08e3c24e
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local