Merge branch 'OpenSSL_1_0_1-stable' of /home/steve/src/git/openssl into OpenSSL_1_0_1...
authorDr. Stephen Henson <steve@openssl.org>
Mon, 14 Jan 2013 00:24:34 +0000 (00:24 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 14 Jan 2013 00:24:34 +0000 (00:24 +0000)

Trivial merge