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 03:40:18 +0000 (13:40 +1000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 28 May 2008 03:40:18 +0000 (13:40 +1000)
(This used to be commit 7ae25aa6125e5375ac9c080a1e95fa34bda0dbe1)


Trivial merge