From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 22 May 2008 06:09:10 +0000 (+1000)
Subject: Merge commit 'origin/v4-0-test' into v4-0-test
X-Git-Tag: samba-4.0.0alpha6~801^3~302^2~77^2~4^2~43
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=fd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5

Merge commit 'origin/v4-0-test' into v4-0-test
(This used to be commit d7f3348c891e14de0e1b195714468ff998400f60)
---

fd7dc46f50d063a3bd4951e8b9bbc17b7632f0c5