Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Tue, 15 Apr 2008 07:54:41 +0000 (09:54 +0200)
committerAndrew Tridgell <tridge@samba.org>
Tue, 15 Apr 2008 07:54:41 +0000 (09:54 +0200)

Trivial merge