Merge remote-tracking branch 'origin/OpenSSL_1_0_1-stable' into OpenSSL_1_0_1-stable
authorBen Laurie <ben@links.org>
Fri, 1 Feb 2013 19:04:26 +0000 (19:04 +0000)
committerBen Laurie <ben@links.org>
Fri, 1 Feb 2013 19:04:26 +0000 (19:04 +0000)

Trivial merge