Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 15 Feb 2008 20:27:49 +0000 (07:27 +1100)
committerAndrew Tridgell <tridge@samba.org>
Fri, 15 Feb 2008 20:27:49 +0000 (07:27 +1100)
(This used to be commit 26475a231f73aaeef31e433b33dbfee6158e321d)


Trivial merge