The following commit has been merged in the openafs-stable-1_6_9-branch branch: commit ca0be5b2a69476cc577976fad0767dfbf8628857 Merge: 9492d2a 3381492 Author: Stephan Wiesand <stephan.wiesand@desy.de> Date: Thu Jun 12 10:52:09 2014 +0200 Merge branch 'security-1.6' into HEAD -- OpenAFS Master Repository