Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
authorSteve French <sfrench@us.ibm.com>
Sat, 14 Jan 2012 05:59:13 +0000 (23:59 -0600)
committerSteve French <sfrench@us.ibm.com>
Sat, 14 Jan 2012 05:59:13 +0000 (23:59 -0600)

Trivial merge