Merge branch 'rsalz-docfixes'
authorRich Salz <rsalz@akamai.com>
Thu, 3 Jul 2014 02:44:53 +0000 (22:44 -0400)
committerRich Salz <rsalz@akamai.com>
Thu, 3 Jul 2014 02:44:53 +0000 (22:44 -0400)

Trivial merge