From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 22 Dec 2008 20:15:59 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba
X-Git-Tag: samba-4.0.0alpha6~413
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=99e637175c0dee050b9c39c124ab1fab8ad7976d

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

99e637175c0dee050b9c39c124ab1fab8ad7976d