merge revision(s) 36306: [Backport #7296]
* test/win32ole/test_win32ole.rb (test_s_codepage_changed): FileSystemObject only supports ANSI or UTF-16LE encoding. Patch by h.shirosaki (Hiroshi Shirosaki) [ruby-trunk - Bug #6650]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
merge revision(s) 36306: [Backport #7296]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@37555 b2dd03c8-39d4-4d8f-98ff-823fe69b080e