Merge branch 'master' of ssh://gerrit.openafs.org/openafs-wiki
authorbrandon s allbery <allbery.b@gmail.com>
Wed, 19 Jun 2013 18:23:33 +0000 (14:23 -0400)
committerbrandon s allbery <allbery.b@gmail.com>
Wed, 19 Jun 2013 18:23:33 +0000 (14:23 -0400)

Trivial merge