From d825d5271953d62b0ea274d655830cf04381bfed Mon Sep 17 00:00:00 2001
From: Wilson Bilkovich <wilson@supremetyrant.com>
Date: Mon, 21 Dec 2009 15:41:22 -0500
Subject: [PATCH] Do not load RubyGems in environment.rb if it already loaded

---
 lib/bundler/templates/environment.erb |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/lib/bundler/templates/environment.erb b/lib/bundler/templates/environment.erb
index 068491a..e467b38 100644
--- a/lib/bundler/templates/environment.erb
+++ b/lib/bundler/templates/environment.erb
@@ -17,7 +17,7 @@ module Bundler
   @gemfile = "#{dir}/<%= filename %>"
 
 <% if options[:rubygems] -%>
-  require "rubygems"
+  require "rubygems" unless respond_to?(:gem) # 1.9 already has RubyGems loaded
 
   @bundled_specs = {}
 <% specs.each do |spec| -%>
-- 
1.6.2.4