From: Andrew Bartlett Date: Thu, 10 Jan 2008 22:25:14 +0000 (+1100) Subject: Merge commit 'origin/v4-0-test' into 4-0-local X-Git-Tag: samba-4.0.0alpha3~536 X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=4720f53a92644dd6959e18923924fbe01889111c;ds=sidebyside Merge commit 'origin/v4-0-test' into 4-0-local --- 4720f53a92644dd6959e18923924fbe01889111c