Merge branch 'OpenSSL_1_0_2-stable' into pre-aead
authorBen Laurie <ben@links.org>
Sat, 5 Oct 2013 20:20:24 +0000 (21:20 +0100)
committerBen Laurie <ben@links.org>
Sat, 5 Oct 2013 20:20:24 +0000 (21:20 +0100)

Trivial merge