Merge branch 'master' of git.openssl.org:openssl
authorRich Salz <rsalz@akamai.com>
Fri, 15 Aug 2014 14:41:50 +0000 (10:41 -0400)
committerRich Salz <rsalz@akamai.com>
Fri, 15 Aug 2014 14:41:50 +0000 (10:41 -0400)

Trivial merge