Merge branch 'master' of git+ssh://git.samba.org/data/git/sfrench/cifs-2.6
authorSteve French <sfrench@us.ibm.com>
Fri, 16 Dec 2011 06:39:20 +0000 (00:39 -0600)
committerSteve French <sfrench@us.ibm.com>
Fri, 16 Dec 2011 06:39:20 +0000 (00:39 -0600)

Trivial merge