Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
authorSteve French <sfrench@us.ibm.com>
Wed, 18 Jan 2012 21:12:04 +0000 (15:12 -0600)
committerSteve French <sfrench@us.ibm.com>
Wed, 18 Jan 2012 21:12:04 +0000 (15:12 -0600)

Trivial merge