Merge branch 'master' of git.openssl.org:openssl
authorRich Salz <rsalz@akamai.com>
Sun, 29 Jun 2014 15:40:39 +0000 (11:40 -0400)
committerRich Salz <rsalz@akamai.com>
Sun, 29 Jun 2014 15:40:39 +0000 (11:40 -0400)

Trivial merge