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)
commit3cb87189f93956075979685d1454e4a514cb71a8
treed99bfbc0d5b0f9271d9ef6973814048f2223f50b
parent88d2e0522737fb8856fb0f52c2af8a2f56130f19
parentd4006e799ac1305092c2d292c9237f58938268a2
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit b3793c6562b1a1e8711561f65594ba0676f9282d)