Merge branch 'master' of openssl.net:openssl
authorBen Laurie <ben@links.org>
Sat, 19 Jan 2013 18:30:10 +0000 (18:30 +0000)
committerBen Laurie <ben@links.org>
Sat, 19 Jan 2013 18:30:10 +0000 (18:30 +0000)

Trivial merge