Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Wed, 20 Aug 2008 05:52:08 +0000 (15:52 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 20 Aug 2008 05:52:08 +0000 (15:52 +1000)
commit9fa48b3572cb4e55cfaa48a8b516a91904048573
treebf0e28640240b5bfb340c717dd2b7451991fd27b
parent358477fcc041d5fb2e6ac5641c2f899cc49cfb69
parent3bdc906eb63a494f0d8478c13f8330828aa2f725
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet