From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 28 May 2008 07:00:21 +0000 (+1000)
Subject: Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
X-Git-Tag: samba-4.0.0alpha6~801^3~297^2~2
X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=1499a7b160f72d8dfa76d281cca52b4263b54ff0;p=samba.git

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 7245e62f08e2bda96471318cac612b25697bc3e9)
---

1499a7b160f72d8dfa76d281cca52b4263b54ff0