merges r28833 from trunk to ruby_1_9_2.

--
* file.c (file_expand_path): wrong condition. [ruby-core:31591]

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

1 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 4abb00f47e..7a3cb9a73e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Aug  2 12:22:22 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (file_expand_path): wrong condition. [ruby-core:31591]
+
 Thu Jul 29 02:38:09 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* configure.in: not [freebsd] but [freebsd*] for AS_CASE.