Merge branch 'master' of git.openssl.org:openssl
authorRich Salz <rsalz@akamai.com>
Tue, 19 Aug 2014 14:02:05 +0000 (10:02 -0400)
committerRich Salz <rsalz@akamai.com>
Tue, 19 Aug 2014 14:02:05 +0000 (10:02 -0400)

Trivial merge