Merge commit 'origin/v4-0-test' into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 18 Jan 2008 06:05:17 +0000 (17:05 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 18 Jan 2008 06:05:17 +0000 (17:05 +1100)

Trivial merge