merge revision(s) 44a0a66559ee4a03a84c27feca05e9b1b0f59df8:

	Move to tool/lib/bundled_gem.rb

	---
	 common.mk               |  6 +++---
	 defs/gmake.mk           |  4 ++--
	 tool/gem-unpack.rb      | 53 -----------------------------------------------
	 tool/lib/bundled_gem.rb | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
	 4 files changed, 60 insertions(+), 58 deletions(-)
	 delete mode 100644 tool/gem-unpack.rb
	 create mode 100644 tool/lib/bundled_gem.rb

1 files changed, 3 insertions, 1 deletions

diff --git a/tool/gem-unpack.rb b/tool/lib/bundled_gem.rb
index 6310c3f92a..0b7d52b86a 100644
--- a/tool/gem-unpack.rb
+++ b/tool/lib/bundled_gem.rb
@@ -5,7 +5,9 @@ require 'rubygems/package'
 # This library is used by "make extract-gems" to
 # unpack bundled gem files.
 
-class << Gem
+module BundledGem
+  module_function
+
   def unpack(file, *rest)
     pkg = Gem::Package.new(file)
     prepare_test(pkg.spec, *rest) {|dir| pkg.extract_files(dir)}