Merge branch '0.24.x'

Conflicts:

	bin/puppetca
	lib/puppet/type/group.rb
	lib/puppet/type/tidy.rb
	lib/puppet/util/settings.rb

Also edited the following files so tests will pass:

       lib/puppet/type/component.rb
       spec/unit/ssl/certificate_request.rb
       spec/unit/type/computer.rb
       spec/unit/type/mcx.rb
       spec/unit/type/resources.rb
       spec/unit/util/settings.rb
       spec/unit/util/storage.rb
       test/ral/type/zone.rb

1 files changed, 2 insertions, 1 deletions

diff --git a/spec/unit/ssl/certificate_request.rb b/spec/unit/ssl/certificate_request.rb
index 3f25500c0..5d0de0814 100755
--- a/spec/unit/ssl/certificate_request.rb
+++ b/spec/unit/ssl/certificate_request.rb
@@ -142,7 +142,8 @@ describe Puppet::SSL::CertificateRequest do
         end
 
         it "should verify the generated request using the public key" do
-            @request.expects(:verify).with(@key.public_key)
+            # Stupid keys don't have a competent == method.
+            @request.expects(:verify).with { |public_key| public_key.to_s == @key.public_key.to_s }.returns true
             @instance.generate(@key)
         end