Merge branch 'rxkad-kdf-master' into HEAD
authorSimon Wilkinson <sxw@your-file-system.com>
Wed, 24 Jul 2013 14:55:26 +0000 (15:55 +0100)
committerSimon Wilkinson <sxw@your-file-system.com>
Wed, 24 Jul 2013 14:55:26 +0000 (15:55 +0100)
Merge the current OpenAFS master branch with the branch on which
OpenAFS-SA-2013-003 and OpenAFS-SA-2013-004 were developed.


Trivial merge