Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 28 May 2008 03:42:29 +0000 (13:42 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 28 May 2008 03:42:29 +0000 (13:42 +1000)
(This used to be commit 3038dd8a4ffae4113f49547a9d4d6b1c8c46397a)


Trivial merge