Merge git://git.samba.org/sfrench/cifs-2.6