From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 28 Mar 2008 11:04:52 +0000 (+1100)
Subject: Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
X-Git-Url: http://git.samba.org/samba.git/?p=jra%2Fsamba%2F.git;a=commitdiff_plain;h=5c4e340ee3ff3dc5d8fdb8b4c6441cfb1071b098

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

5c4e340ee3ff3dc5d8fdb8b4c6441cfb1071b098