Merge branch 'master' of git.openssl.org:openssl
authorRich Salz <rsalz@akamai.com>
Tue, 15 Jul 2014 04:05:43 +0000 (00:05 -0400)
committerRich Salz <rsalz@akamai.com>
Tue, 15 Jul 2014 04:05:43 +0000 (00:05 -0400)

Trivial merge