Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 14 Feb 2008 02:37:37 +0000 (13:37 +1100)
committerAndrew Tridgell <tridge@samba.org>
Thu, 14 Feb 2008 02:37:37 +0000 (13:37 +1100)

Trivial merge