Merge branch 'master' into master_no_global_resources

Conflicts:

	lib/puppet/node/catalog.rb
	lib/puppet/type/pfile.rb
	lib/puppet/type/pfilebucket.rb
	lib/puppet/util/filetype.rb
	spec/unit/node/catalog.rb
	spec/unit/other/transbucket.rb
	spec/unit/ral/provider/mount/parsed.rb
	spec/unit/ral/types/file.rb
	spec/unit/ral/types/interface.rb
	spec/unit/ral/types/mount.rb
	spec/unit/ral/types/package.rb
	spec/unit/ral/types/schedule.rb
	spec/unit/ral/types/service.rb
	test/language/compile.rb
	test/language/lexer.rb
	test/language/snippets.rb
	test/lib/puppettest.rb
	test/ral/types/basic.rb
	test/ral/types/cron.rb
	test/ral/types/exec.rb
	test/ral/types/file.rb
	test/ral/types/file/target.rb
	test/ral/types/filebucket.rb
	test/ral/types/fileignoresource.rb
	test/ral/types/filesources.rb
	test/ral/types/group.rb
	test/ral/types/host.rb
	test/ral/types/parameter.rb
	test/ral/types/sshkey.rb
	test/ral/types/tidy.rb
	test/ral/types/user.rb
	test/ral/types/yumrepo.rb

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/puppet/util/diff.rb b/lib/puppet/util/diff.rb
index e6ff57108..f37ea0850 100644
--- a/lib/puppet/util/diff.rb
+++ b/lib/puppet/util/diff.rb
@@ -27,7 +27,7 @@ module Puppet::Util::Diff
 
         output = ""
 
-        diffs = Diff::LCS.diff(data_old, data_new)
+        diffs = ::Diff::LCS.diff(data_old, data_new)
         return output if diffs.empty?
 
         oldhunk = hunk = nil
@@ -35,7 +35,7 @@ module Puppet::Util::Diff
 
         diffs.each do |piece|
             begin
-                hunk = Diff::LCS::Hunk.new(data_old, data_new, piece, 
+                hunk = ::Diff::LCS::Hunk.new(data_old, data_new, piece, 
                                            context_lines, 
                                            file_length_difference)
                 file_length_difference = hunk.file_length_difference