Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Fri, 11 Jan 2008 02:16:08 +0000 (13:16 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 11 Jan 2008 02:16:08 +0000 (13:16 +1100)
commit6a875cc8529d971cd41d2ba53952481545989d53
tree910e499472f4204ffbd26bb43ad122e5a2af53bc
parentf5277a3e2129f713cba3f63ffa96b1706f8d802f
parent1f4838b8a3e5f0c7c400097f56329e5a133ec4e8
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
(This used to be commit 597f9fe17685fb7909269bc0af04bf4a040e2ad7)