Merge branch '0.25.x'

Conflicts:
	lib/puppet/agent.rb
	lib/puppet/application/puppet.rb
	lib/puppet/configurer.rb
	man/man5/puppet.conf.5
	spec/integration/defaults.rb
	spec/unit/configurer.rb

1 files changed, 2 insertions, 1 deletions

diff --git a/spec/unit/util/autoload.rb b/spec/unit/util/autoload.rb
index 4e1384246..220cb5f68 100755
--- a/spec/unit/util/autoload.rb
+++ b/spec/unit/util/autoload.rb
@@ -51,8 +51,9 @@ describe Puppet::Util::Autoload do
         end
 
         it "should include the module directories, the Puppet libdir, and all of the Ruby load directories" do
+            Puppet.stubs(:[]).with(:libdir).returns(%w{/libdir1 /lib/dir/two /third/lib/dir}.join(File::PATH_SEPARATOR))
             @autoload.expects(:module_directories).returns %w{/one /two}
-            @autoload.search_directories.should == ["/one", "/two", Puppet[:libdir], $:].flatten
+            @autoload.search_directories.should == %w{/one /two /libdir1 /lib/dir/two /third/lib/dir} + $:
         end
 
         it "should include in its search path all of the search directories that have a subdirectory matching the autoload path" do