From: Jeremy Allison <jeremy@jeremy-desktop.(none)>
Date: Tue, 23 Dec 2008 18:43:02 +0000 (-0800)
Subject: Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
X-Git-Tag: samba-4.0.0alpha6~388
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7e1f0e272ca2db577a929a2bbef651cf5759535e;p=thirdparty%2Fsamba.git

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

7e1f0e272ca2db577a929a2bbef651cf5759535e