From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 16 Dec 2008 14:36:53 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.samba.org/data/git/samba
X-Git-Tag: samba-4.0.0alpha6~473^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7109b183b555ee795c3e32c63e2647025705fc1;p=thirdparty%2Fsamba.git

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

a7109b183b555ee795c3e32c63e2647025705fc1