Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Wed, 26 Mar 2008 04:42:43 +0000 (15:42 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 26 Mar 2008 04:42:43 +0000 (15:42 +1100)
commit4bb658d5c8c8461169c827194139e599944a81ed
treee7d2ee616dd185b7498accdf10281c3ea47cdb46
parentd5a71ed633ab9086f56a9bf0812044d0cfa9df96
parent07251792d4e020217ba23896dc65702853f31939
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit e1095673089d12e11a4e17a8d6c5b756cc9f427b)