Merge branch 'v3-0-test' of git://git.samba.org/samba into v3-0-test