Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 30 May 2008 07:26:42 +0000 (17:26 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 30 May 2008 07:26:42 +0000 (17:26 +1000)
commitbe1927cd80838a6807827cef4431c03160d52582
tree759fdea9f2c65277f56209494511d24b6f7f1270
parent9c1519c065a4411b3eb37e8d7738269238950227
parentbeaa01e403dda7557a6acdf0181d79d58a33bbbe
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 31308caad0a83a487341307e4e810a69c08ff371)