Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Thu, 20 Mar 2008 02:25:05 +0000 (13:25 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 20 Mar 2008 02:25:05 +0000 (13:25 +1100)
commit21507f3b7da3f055d5056a636a2b1833eafe590f
tree9454d8483d87fb872d6265a7265d2f792e5153eb
parent9a1bec08013dda77597369387da0193081a7a6e2
parent028ba4682caa874be70ceb7f0df1a3c138998641
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 7c4356084a389c3a4edc16f06906ce6127a3a59b)