From: Andrew Bartlett Date: Sat, 28 Jun 2008 12:04:19 +0000 (+1000) 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/?a=commitdiff_plain;h=43bf8f4546c94d19c4bb203835e91c640b553116;p=jra%2Fsamba%2F.git Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local (This used to be commit 6479f481dbf2f5c83edec0702ece73e83b6c810e) --- 43bf8f4546c94d19c4bb203835e91c640b553116