merges r23494 from trunk into ruby_1_9_1.

--
* lib/tempfile.rb (Tempfile#unlink): close first for Windows.  a
  patch from Florian Frank.  [ruby-core:23505]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 61dc74034..ba83425b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 20 06:20:05 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile#unlink): close first for Windows.  a
+	  patch from Florian Frank.  [ruby-core:23505]
+
 Wed May 20 00:05:52 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* vm_method.c (rb_attr): should preserve encoding info.