Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Sun, 24 Aug 2008 22:27:06 +0000 (08:27 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Sun, 24 Aug 2008 22:27:06 +0000 (08:27 +1000)

Trivial merge