From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 29 Mar 2008 03:14:25 +0000 (+1100)
Subject: Merge branch 'v4-0-test' of git://git.id10ts.net/samba into 4-0-local
X-Git-Tag: samba-4.0.0alpha6~801^3~302^2~120
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=40bcb11d29993991f956cf90894f312b159ed993

Merge branch 'v4-0-test' of git://git.id10ts.net/samba into 4-0-local
(This used to be commit f39af7c2c35abb794e1dc1a496c1960221f006f2)
---

40bcb11d29993991f956cf90894f312b159ed993