merges r24553 from trunk into ruby_1_9_1.

--
* lib/csv.rb: Change magic comment to US-ASCII in order to
  make literals as US-ASCII.

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

3 files changed, 7 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 5ea02f34e..313242079 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 16 15:25:26 2009  NARUSE, Yui  <naruse@ruby-lang.org>
+
+	* lib/csv.rb: Change magic comment to US-ASCII in order to
+	  make literals as US-ASCII.
+
 Sun Aug 16 10:45:10 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* regparse.c (parse_char_class, parse_exp, parse_branch),
diff --git a/lib/csv.rb b/lib/csv.rb
index 8adc2973b..832ff2f06 100644
--- a/lib/csv.rb
+++ b/lib/csv.rb
@@ -1,5 +1,4 @@
-#!/usr/bin/env ruby -w
-# encoding: UTF-8
+# encoding: US-ASCII
 # = csv.rb -- CSV Reading and Writing
 #
 #  Created by James Edward Gray II on 2005-10-31.
diff --git a/version.h b/version.h
index eec72f512..f35f25532 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 292
+#define RUBY_PATCHLEVEL 293
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1