From: Andrew Bartlett Date: Wed, 20 Feb 2008 22:55:13 +0000 (+1100) Subject: Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local X-Git-Tag: samba-4.0.0alpha6~801^3~450^2~48^2~1 X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=774fa12ac1695600710ce9fac18024edd38161ee Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local (This used to be commit 5cd3310b78a85243eb436d05db3228c3495f9162) --- 774fa12ac1695600710ce9fac18024edd38161ee