From: Jelmer Vernooij Date: Fri, 31 Oct 2008 15:17:10 +0000 (+0100) Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba X-Git-Url: http://git.samba.org/samba.git/?p=kai%2Fsamba.git;a=commitdiff_plain;h=161cb81911fe8877bfefd8bd3553f0b3166299fb Merge branch 'master' of ssh://git.samba.org/data/git/samba --- 161cb81911fe8877bfefd8bd3553f0b3166299fb