From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 15 Apr 2008 07:54:41 +0000 (+0200)
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~339^2~55^2~7
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=b967afca648eea481e586f367f99464418cf8468

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

b967afca648eea481e586f367f99464418cf8468