Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Fri, 11 Apr 2008 04:35:26 +0000 (14:35 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 11 Apr 2008 04:35:26 +0000 (14:35 +1000)
commit67faa71c5be5fabeeef16d97c2ed9af152af198d
treec0011a07a68d3f988005c030426004124d047b2e
parentae977ef24780c52da66e3608a3ed94649ae9f873
parent3d01c8eb6d4a9da9dc3dde9edb4057b534655e1d
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit de5349cc7a5a97c0d2d7288436a4090dfd9bd093)