From a48e727f85c9600b81c40b1780e9b774ba77ef74 Mon Sep 17 00:00:00 2001
From: ayumin <ayumin@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 3 Jan 2012 10:16:53 +0000
Subject: [PATCH] merge revision(s) 33343:

   * test/rexml/test_sax.rb: add require rexml/document.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34200 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog              | 5 +++++
 test/rexml/test_sax.rb | 1 +
 version.h              | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index c2a7d99e76..040ec9fe6d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 03 19:13:05 2012  Ayumu AIZAWA  <ayumu.aizawa@gmail.com>
+
+	* test/rexml/test_sax.rb: add require 'rexml/document'.
+	  [Backport #5834] [ruby-dev:45079]
+
 Tue Jan  3 19:05:42 2012  Naohisa Goto  <ngotogenome@gmail.com>
 
 	* include/ruby/defines.h (FLUSH_REGISTER_WINDOWS): move sparc asm code
diff --git a/test/rexml/test_sax.rb b/test/rexml/test_sax.rb
index f5d7fb44ce..8873e1703d 100644
--- a/test/rexml/test_sax.rb
+++ b/test/rexml/test_sax.rb
@@ -1,6 +1,7 @@
 require "rexml_test_utils"
 require 'rexml/sax2listener'
 require 'rexml/parsers/sax2parser'
+require 'rexml/document'
 
 class SAX2Tester < Test::Unit::TestCase
   include REXMLTestUtils
diff --git a/version.h b/version.h
index 906aee7fa2..fd7827cebe 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 17
+#define RUBY_PATCHLEVEL 18
 
 #define RUBY_RELEASE_DATE "2012-01-03"
 #define RUBY_RELEASE_YEAR 2012