Merge branch 'master' of git.openssl.org:openssl
authorRich Salz <rsalz@akamai.com>
Tue, 12 Aug 2014 19:33:36 +0000 (15:33 -0400)
committerRich Salz <rsalz@akamai.com>
Tue, 12 Aug 2014 19:33:36 +0000 (15:33 -0400)

Trivial merge