Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 10:41:50 +0000 (20:41 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 10:41:50 +0000 (20:41 +1000)
commit4bdb752cc51c9f41859f1a43bf5721ae616fa230
treed54fcf154bb893c2a4f8679a7300f99778d96fc8
parent16112762e70879b50f1dfc49452d6d278bd256cf
parentc1c6c1b609ab57186dab7b13c56bfe4475a733f7
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit b4b14b748e6babc93faee23fe8f5c03ec2d25cbb)