Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Sat, 19 Apr 2008 07:59:07 +0000 (09:59 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Sat, 19 Apr 2008 07:59:07 +0000 (09:59 +0200)
commit61fba825940b03ac954208cc0ead4ed2c0af848a
treea1bd49b2ec3ef31f39307439cdd1c4711644c44c
parent0321bc02598087685c6ea144e3920a64ab909b83
parentf0eb488d221d2d12d750babac0252aac671d92f4
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 13a0941d3432dc7dae552048265ad1e762b781d4)