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)
commit0a27ff953e17670aecc7aedb56c0f872cc4bb75d
tree18ed167d94e1a50acf04bc22fc6d8f01bf7f1a5f
parent8acc7f7da7718c7750387c1043391618be46e15b
parentcc43037f19056ed24d7fffa54456d597c63ad105
Merge branch 'abartlet-4-0-local' into v4-0-test
(This used to be commit 469fac2669991b130dec219e1a109a8b2ce224be)