Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 3 Sep 2008 05:34:44 +0000 (15:34 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 3 Sep 2008 05:34:44 +0000 (15:34 +1000)

Trivial merge