Merge branch 'master' of git.openssl.org:openssl
authorRich Salz <rsalz@openssl.org>
Tue, 9 Sep 2014 21:06:40 +0000 (17:06 -0400)
committerRich Salz <rsalz@openssl.org>
Tue, 9 Sep 2014 21:06:50 +0000 (17:06 -0400)
Previous commit was reviewed by Geoff, not Stephen:
Reviewed-by: Geoff Thorpe <geoff@openssl.org>

Trivial merge