Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 29 Aug 2008 21:38:02 +0000 (07:38 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 29 Aug 2008 21:38:02 +0000 (07:38 +1000)

Trivial merge