Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
authorAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 11:16:40 +0000 (21:16 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Fri, 15 Aug 2008 11:16:40 +0000 (21:16 +1000)
commit489525a6390e50bd0442295ac45164f43a7576c8
tree44a8715d7359c2efcc482f87bea82dd92bd080de
parentcd261ee651d3059f6973464115ff43da71d8a595
parent4bdb752cc51c9f41859f1a43bf5721ae616fa230
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit fa03d750e4577a610dc410d45d49789110b1b4f1)