From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 23 Dec 2008 18:30:16 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba
X-Git-Tag: samba-4.0.0alpha6~388^2
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=5dce4148a3d30cbc0ca434049761434c5cc8cb33

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

5dce4148a3d30cbc0ca434049761434c5cc8cb33