Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6