From: Jelmer Vernooij Date: Fri, 24 Oct 2008 14:38:44 +0000 (+0200) 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=791f9e09b82b5382f6005482a4e3faa62ce30fae Merge branch 'master' of ssh://git.samba.org/data/git/samba --- 791f9e09b82b5382f6005482a4e3faa62ce30fae