Merge branch 'OpenSSL_1_0_2-stable' into agl-1.0.2aead
authorBen Laurie <ben@links.org>
Fri, 4 Oct 2013 11:48:24 +0000 (12:48 +0100)
committerBen Laurie <ben@links.org>
Fri, 4 Oct 2013 11:48:24 +0000 (12:48 +0100)

Trivial merge