Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 2 Jul 2008 11:47:21 +0000 (21:47 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 2 Jul 2008 11:47:21 +0000 (21:47 +1000)
(This used to be commit b4e7063058ac8587c526dd9133aee345e99f8ef8)


Trivial merge