Merge branch 'master' of /home/jelmer/samba3