From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 19 Dec 2008 20:47:45 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba
X-Git-Tag: samba-4.0.0alpha6~467
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5076c64d43c68a028ac944c336715b4cb277365f;p=thirdparty%2Fsamba.git

Merge branch 'master' of ssh://git.samba.org/data/git/samba
---

5076c64d43c68a028ac944c336715b4cb277365f