Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Mon, 14 Apr 2008 09:32:04 +0000 (11:32 +0200)
committerAndrew Tridgell <tridge@samba.org>
Mon, 14 Apr 2008 09:32:04 +0000 (11:32 +0200)
(This used to be commit 068c973dbeed5b0f5ccab4f780ae7db3535f5910)


Trivial merge