From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 4 Feb 2008 22:16:37 +0000 (+1100)
Subject: Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
X-Git-Tag: samba-4.0.0alpha6~801^3~632
X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=c46b8708f443f2f048cf41f693dfe6c133fe53f3;hp=c46b8708f443f2f048cf41f693dfe6c133fe53f3;ds=sidebyside

Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit 7fc3669b9dc34514d8749d3941514fdae7d0f700)
---