From: Jelmer Vernooij Date: Thu, 23 Oct 2008 19:59:15 +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=f18296151d1d8774b861ef6bd751b48ef9ee2f92 Merge branch 'master' of ssh://git.samba.org/data/git/samba --- f18296151d1d8774b861ef6bd751b48ef9ee2f92