Merge branch 'v4-0-stable' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 3 Jun 2008 05:13:28 +0000 (15:13 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 3 Jun 2008 05:13:28 +0000 (15:13 +1000)

Trivial merge