Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Wed, 21 May 2008 23:48:20 +0000 (01:48 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 21 May 2008 23:48:20 +0000 (01:48 +0200)
commita9c142d4f489be6619066abd59659227b65fa21e
tree896bc1065eb8aa468872f8a11b980881004535e5
parent84a3290c8f0adf1248e61ab9f6c88bcfd4650375
parent334de182f47932cbe59b0519bc38a44985055cc7
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 30f8d581aa339b37b27011e65355937590df10b9)