Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Sat, 7 Jun 2008 05:11:00 +0000 (22:11 -0700)
committerAndrew Tridgell <tridge@samba.org>
Sat, 7 Jun 2008 05:11:00 +0000 (22:11 -0700)
(This used to be commit 8e96f2edb003d997e71e9e237463882696279d0f)


Trivial merge