Merge branch 'master' of git.openssl.org:openssl
authorRich Salz <rsalz@akamai.com>
Mon, 11 Aug 2014 17:45:03 +0000 (13:45 -0400)
committerRich Salz <rsalz@akamai.com>
Mon, 11 Aug 2014 17:45:03 +0000 (13:45 -0400)

Trivial merge