Merge pull request #1165 from LarsWestergren/master

Bug 1092 fix

Signed-off-by: Charles Oliver Nutter <headius@headius.com>

Conflicts:
	test/externals/ruby2.0/openssl/test_pkcs12.rb
Merge branch 'jruby-1_7'