From: Andrew Bartlett Date: Wed, 21 May 2008 04:34:43 +0000 (+1000) Subject: Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local X-Git-Url: http://git.samba.org/samba.git/?p=jra%2Fsamba%2F.git;a=commitdiff_plain;h=40ff67e4546780f422c01bb487921d93ac809def Merge branch 'v4-0-local' of git://git.id10ts.net/samba into 4-0-local (This used to be commit 0e429dd1fb15137a2a7c25e051b9af8c4ed8c7f3) --- 40ff67e4546780f422c01bb487921d93ac809def