Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Thu, 24 Jul 2008 04:26:30 +0000 (14:26 +1000)
committerAndrew Tridgell <tridge@samba.org>
Thu, 24 Jul 2008 04:26:30 +0000 (14:26 +1000)
(This used to be commit 24309dbf4d9622fcfafa29ef98bc0459fdaa814b)


Trivial merge