merge revision(s) 40001: [Backport #8609]

	* win32/win32.c (wrename): use MoveFileExW instead of MoveFileW,
	  because the latter fails on cross device file move of some
	  environments.
	  fix [ruby-core:53492] [Bug #8109]
	  reported by mitchellh (Mitchell Hashimoto)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@42460 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
* lib/net/http.rb (Net::HTTP#send_request_with_body_stream): use
  String#bytesize instead of String#length.
  reported by shekhei (shek hei wong) at [ruby-core:53775]
  [Backport #8176].


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@42461 b2dd03c8-39d4-4d8f-98ff-823fe69b080e