Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Tue, 12 Feb 2008 23:14:04 +0000 (10:14 +1100)
committerAndrew Tridgell <tridge@samba.org>
Tue, 12 Feb 2008 23:14:04 +0000 (10:14 +1100)

Trivial merge