Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 10 Sep 2008 04:09:07 +0000 (14:09 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 10 Sep 2008 04:09:07 +0000 (14:09 +1000)
(This used to be commit ed26195d0eda6dd1ca14508cfd31a48dde79d44f)


Trivial merge