Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Wed, 30 Jan 2008 22:49:15 +0000 (09:49 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 30 Jan 2008 22:49:15 +0000 (09:49 +1100)

Trivial merge