Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 17 Apr 2008 13:21:08 +0000 (15:21 +0200)
committerAndrew Tridgell <tridge@samba.org>
Thu, 17 Apr 2008 13:21:08 +0000 (15:21 +0200)
(This used to be commit 3ab9abf40605a4a6b220faeebaef81546a8d87a0)


Trivial merge