Merge branch 'OpenSSL_1_0_1-stable' of openssl.net:openssl into OpenSSL_1_0_1-stable
authorDr. Stephen Henson <steve@openssl.org>
Sun, 13 Jan 2013 23:01:43 +0000 (23:01 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Sun, 13 Jan 2013 23:01:43 +0000 (23:01 +0000)

Trivial merge