From a240969763e531a5a1cbcd0fd1c07319deb8edb8 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Thu, 20 Mar 2008 14:08:48 -0500
Subject: Applying patch by wyvern to fix #1142.

---
 lib/puppet/util/diff.rb | 4 ++--
 1 file 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
-- 
cgit