Merge commit 'origin/v4-0-test' into trusted-domains
commitb533a1f4bf62c7983f612927499f60b503322c4d
authorAndrew Bartlett <abartlet@samba.org>
Thu, 4 Sep 2008 01:32:32 +0000 (4 11:32 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Thu, 4 Sep 2008 01:32:32 +0000 (4 11:32 +1000)
tree82bb0bd315ce7afcd1963d4dcd7aaf727257fda8
parentb936d0f3bed9d6ab42803f71cb02c929acf7e518
parentfbbe799e4e68d79846614c6648307cc6b3f76906
Merge commit 'origin/v4-0-test' into trusted-domains
(This used to be commit b599b83a13db90b50a5422ff73daa63648b1e8cd)