From: Jelmer Vernooij Date: Thu, 23 Oct 2008 18:50:59 +0000 (+0200) Subject: Merge branch 'master' of git://git.samba.org/samba X-Git-Tag: samba-4.0.0alpha6~710^2~1 X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=215b84903ed202e69241d9fd9494fdc95e911efc Merge branch 'master' of git://git.samba.org/samba --- 215b84903ed202e69241d9fd9494fdc95e911efc