<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -23,7 +23,8 @@ module Kernel
         if name =~ /^merb/ &amp;&amp; try_framework
           require name
         else
-          Gem.activate(name, true, *ver)
+          gem(name, *ver) if ver
+          require name
           Merb.logger.info(&quot;loading gem '#{name}' from #{__app_file_trace__.first} ...&quot;)
         end
       rescue LoadError</diff>
      <filename>lib/merb-core/core_ext/kernel.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>0fc1a185a418061c06597f032f9a5e551719c1a4</id>
    </parent>
  </parents>
  <author>
    <name>Michael D. Ivey</name>
    <email>ivey@gweezlebur.com</email>
  </author>
  <url>http://github.com/wycats/merb/commit/384685cc991b912aa369c95f0345294c3c1ac510</url>
  <id>384685cc991b912aa369c95f0345294c3c1ac510</id>
  <committed-date>2008-03-04T21:46:12-08:00</committed-date>
  <authored-date>2008-03-04T21:46:12-08:00</authored-date>
  <message>change dependency() to use gem() instead of Gem.activate</message>
  <tree>857864f3df22c4a1c9086067563ef42d205fed51</tree>
  <committer>
    <name>Michael D. Ivey</name>
    <email>ivey@gweezlebur.com</email>
  </committer>
</commit>
