Merge commit 'origin/v4-0-test' into v4-0-test
commite80876ef9ef1a82d1bc342ce50a73ab17a336808
authorAndrew Tridgell <tridge@samba.org>
Fri, 22 Aug 2008 08:39:52 +0000 (22 18:39 +1000)
committerAndrew Tridgell <tridge@samba.org>
Fri, 22 Aug 2008 08:39:52 +0000 (22 18:39 +1000)
treef561d69bc3164a1014abe6b95070bcbd488a5373
parent0521ed1ddff403094e6d0f22541f47ac87747679
parent9d3add9b9f9fff2163bd04cfc5d8919ca053ef55
Merge commit 'origin/v4-0-test' into v4-0-test
(This used to be commit 93cf0b3c7e6d8a4758c44519de51e51be89f76c7)