Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Wed, 13 Feb 2008 04:06:05 +0000 (15:06 +1100)
committerAndrew Tridgell <tridge@samba.org>
Wed, 13 Feb 2008 04:06:05 +0000 (15:06 +1100)
(This used to be commit b3793c6562b1a1e8711561f65594ba0676f9282d)


Trivial merge