Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 29 May 2008 12:23:25 +0000 (22:23 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 29 May 2008 12:23:25 +0000 (22:23 +1000)

Trivial merge