merge revision(s) 27321:

* LEGAL: separated the section for parse.c.  contributed by Paul
	  Betteridge in [ruby-core:29472].


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

ChangeLog

@@ -1,3 +1,8 @@
+Tue Jun  8 15:14:11 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* LEGAL: separated the section for parse.c.  contributed by Paul
+	  Betteridge in [ruby-core:29472].
+
 Tue Jun  8 14:00:33 2010  Keiju Ishitsuka  <keiju@ruby-lang.org>
 
 	* ext/rational/lib/rational.rb: fix [Bug #1397].

LEGAL

@@ -45,7 +45,6 @@ configure:
 
 config.guess:
 config.sub:
-parse.c:
 
   As long as you distribute these files with the file configure, they
   are covered under the Ruby's license.
@@ -72,6 +71,43 @@ parse.c:
     configuration script generated by Autoconf, you may include it under
     the same distribution terms that you use for the rest of that program.
 
+parse.c:
+
+  This file is licensed under the GPL, but is incorporated into Ruby and 
+  redistributed under the terms of the Ruby license, as permitted by the
+  exception to the GPL below.
+
+     Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+     Free Software Foundation, Inc.
+
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation; either version 2, or (at your option)
+     any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.  */
+
+  /* As a special exception, you may create a larger work that contains
+     part or all of the Bison parser skeleton and distribute that work
+     under terms of your choice, so long as that work isn't itself a
+     parser generator using the skeleton or a modified version thereof
+     as a parser skeleton.  Alternatively, if you modify or redistribute
+     the parser skeleton itself, you may (at your option) remove this
+     special exception, which will cause the skeleton and the resulting
+     Bison output files to be licensed under the GNU General Public
+     License without this special exception.
+
+     This special exception was added by the Free Software Foundation in
+     version 2.2 of Bison.  */
+
 util.c (partly):
 win32/win32.[ch]:
 

version.h

@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-06-08"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20100608
-#define RUBY_PATCHLEVEL 271
+#define RUBY_PATCHLEVEL 272
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8