Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Mon, 21 Jan 2008 11:01:32 +0000 (22:01 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 21 Jan 2008 11:01:32 +0000 (22:01 +1100)
commit24efc9fc36194d379838eb9911b65e93535da19b
treefa08fcbf21143655eb85ba79c6169b3b2eb24fdd
parent8623c981b4a67dafc19234faffced1796f33b975
parent440b1a1d04bca3027100b3bda84738730ffce71c
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit b99b604a5f8b7eb98a6285145188c0b94946df78)