Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Wed, 28 May 2008 07:00:21 +0000 (17:00 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 28 May 2008 07:00:21 +0000 (17:00 +1000)

Trivial merge