Merge branch 'ben/timing-1.0.1' into OpenSSL_1_0_1-stable
authorDr. Stephen Henson <steve@openssl.org>
Thu, 31 Jan 2013 17:04:41 +0000 (17:04 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 31 Jan 2013 17:04:41 +0000 (17:04 +0000)

Trivial merge