Merge branch 'security-1.6' into HEAD openafs-stable-1_6_9-branch openafs-stable-1_6_9
authorStephan Wiesand <stephan.wiesand@desy.de>
Thu, 12 Jun 2014 08:52:09 +0000 (10:52 +0200)
committerStephan Wiesand <stephan.wiesand@desy.de>
Thu, 12 Jun 2014 08:52:09 +0000 (10:52 +0200)

Trivial merge