Merge commit 'origin/v4-0-test' into trusted-domains
authorAndrew Bartlett <abartlet@samba.org>
Thu, 4 Sep 2008 01:32:32 +0000 (11:32 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 4 Sep 2008 01:32:32 +0000 (11:32 +1000)
commitb599b83a13db90b50a5422ff73daa63648b1e8cd
treeb688e7e25d12100b9ab2ed8392277b237fb0c6fe
parent9590805bcbdd1924eda5a69978ffac7ec7603451
parente8ba65c4db986fcedf7008d05d8f8846f78a98f1
Merge commit 'origin/v4-0-test' into trusted-domains