Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Thu, 17 Apr 2008 12:25:22 +0000 (14:25 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 17 Apr 2008 12:25:22 +0000 (14:25 +0200)

Trivial merge