diff --git a/ChangeLog b/ChangeLog
index b9cfd9473a..2103874318 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Oct 11 10:27:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/irb/context.rb (IRB::Context#irb_name): removed duplicated
+	  attr_reader.  [ruby-core:26047]
+
+	* lib/irb/ruby-lex.rb (RubyLex#lex_int2): removed duplicated
+	  character class range.
+
 Sun Oct 11 10:04:35 2009  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* regparse.c (fetch_token_in_cc): warn when \p is not
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index d7822d6f27..497d7bf637 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -165,8 +165,6 @@ module IRB
       @workspace.evaluate self, "_ = IRB.CurrentContext.last_value"
     end
 
-    attr_reader :irb_name
-
     def prompt_mode=(mode)
       @prompt_mode = mode
       pconf = IRB.conf[:PROMPT][mode]
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index b49337c1c6..5a6c2894fb 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -705,7 +705,7 @@ class RubyLex
 
     @OP.def_rule('@') do
       |op, io|
-      if peek(0) =~ /[\w_@]/
+      if peek(0) =~ /[\w@]/
 	ungetc
 	identify_identifier
       else