Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Tue, 20 May 2008 05:35:49 +0000 (15:35 +1000)
committerAndrew Tridgell <tridge@samba.org>
Tue, 20 May 2008 05:35:49 +0000 (15:35 +1000)
(This used to be commit e360be0b99b638afdfa789e217bf08f99d09be7a)


Trivial merge