Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jul 2008 08:39:37 +0000 (18:39 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 28 Jul 2008 08:39:37 +0000 (18:39 +1000)

Trivial merge