[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit 61636e4a15c365f57bc510fd601b1ac6be460614
Author: Luke Kanies <luke at reductivelabs.com>
Date:   Thu Jan 21 23:13:52 2010 -0800

    Tuning file load order
    
    Signed-off-by: Luke Kanies <luke at reductivelabs.com>

diff --git a/lib/puppet.rb b/lib/puppet.rb
index 0904f04..2e531ad 100644
--- a/lib/puppet.rb
+++ b/lib/puppet.rb
@@ -152,6 +152,8 @@ end
 
 require 'puppet/type'
 require 'puppet/parser'
+require 'puppet/resource'
+require 'puppet/resource/reference'
 require 'puppet/network'
 require 'puppet/ssl'
 require 'puppet/module'
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index dd85342..f50d466 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -4,6 +4,8 @@ require 'getoptlong'
 require 'puppet/external/event-loop'
 require 'puppet/util/cacher'
 require 'puppet/util/loadedfile'
+require 'puppet/resource'
+require 'puppet/resource/reference'
 
 # The class for handling configuration files.
 class Puppet::Util::Settings

-- 
Puppet packaging for Debian