From: Andrew Bartlett Date: Tue, 10 Jun 2008 03:19:56 +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/?p=kai%2Fsamba.git;a=commitdiff_plain;h=7721ea8f9c75d304111935048167dd27525cc91a Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local (This used to be commit 1d52d9cc70158dbe30325220aa5c1e6203c8b72b) --- 7721ea8f9c75d304111935048167dd27525cc91a