merges r24332 and r24333 from trunk into ruby_1_9_1.

--
* parse.y (literal_concat_gen): NODE_DSTR was incorrectly handled as
  NODE_STR.  [ruby-dev:38968]

* bootstraptest/test_syntax.rb: add a test for above.
--
* parse.y (literal_concat_gen): reduced unnecessary node at string
  literal concatenation with empty head dstr.  [ruby-dev:38968]

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

1 files changed, 1 insertions, 1 deletions

diff --git a/version.h b/version.h
index 02ddd40be..372cc4d3f 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 258
+#define RUBY_PATCHLEVEL 259
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1