merges r25404 from trunk into ruby_1_9_1. fixes the backport task #2232.

--
* parse.y (mlhs_basic): fixed handling splat in middle of mlhs.  a
  patch from Andy Keep in [ruby-core:26163]

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

1 files changed, 2 insertions, 1 deletions

diff --git a/parse.y b/parse.y
index b84d6143bf..1fa248bf2c 100644
--- a/parse.y
+++ b/parse.y
@@ -1475,7 +1475,8 @@ mlhs_basic	: mlhs_head
 		    /*%%%*/
 			$$ = NEW_MASGN($1, NEW_POSTARG($3,$5));
 		    /*%
-			$$ = mlhs_add_star($1, $3);
+			$1 = mlhs_add_star($1, $3);
+			$$ = mlhs_add($1, $5);
 		    %*/
 		    }
 		| mlhs_head tSTAR