merge revision(s) r48854: [Backport ruby#10494]

	* test/lib/test/unit.rb: Also rescue EINVAL for older Linux that
  raises it in popen. [Bug ruby#10494]

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

Author: nagachika

lib/test/unit.rb

@@ -394,7 +394,7 @@ def terminal_width
           begin
             require 'io/console'
             width = $stdout.winsize[1]
-          rescue LoadError, NoMethodError, Errno::ENOTTY, Errno::EBADF
+          rescue LoadError, NoMethodError, Errno::ENOTTY, Errno::EBADF, Errno::EINVAL
             width = ENV["COLUMNS"].to_i.nonzero? || 80
           end
           width -= 1 if /mswin|mingw/ =~ RUBY_PLATFORM

version.h

@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2015-03-09"
-#define RUBY_PATCHLEVEL 309
+#define RUBY_RELEASE_DATE "2015-03-10"
+#define RUBY_PATCHLEVEL 310
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
 
 #include "ruby/version.h"