Merge branch 'abartlet-4-0-local' into v4-0-test
authorAndrew Tridgell <tridge@samba.org>
Fri, 22 Aug 2008 07:37:43 +0000 (17:37 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 22 Aug 2008 07:37:43 +0000 (17:37 +1000)
commit469fac2669991b130dec219e1a109a8b2ce224be
tree34297a8376b95429547657f3c72a30fc7de6a729
parentadbff0b0f92aa0742a8293071776b388879cbd8e
parent26c6aa5a80ffaf06fc33f30a6533f8f16ef538bc
Merge branch 'abartlet-4-0-local' into v4-0-test