Merge branch '0.24.x'

Also added the fixes to make the certhandler tests pass
even when certs exist; I'll deal with the conflict later.

Conflicts:

	CHANGELOG
	bin/puppetd
	lib/puppet/network/http/handler.rb
	lib/puppet/network/http/mongrel/rest.rb
	spec/integration/indirector/rest.rb
	spec/integration/network/server/mongrel.rb
	spec/integration/network/server/webrick.rb
	spec/unit/network/http/webrick.rb

1 files changed, 1 insertions, 1 deletions

diff --git a/Rakefile b/Rakefile
index 1a3faad09..f4f88f2cc 100644
--- a/Rakefile
+++ b/Rakefile
@@ -23,7 +23,7 @@ project = Rake::RedLabProject.new("puppet") do |p|
         'lib/puppet.rb',
         'lib/puppet/**/*.rb',
         'lib/puppet/**/*.py',
-        'test/**/*.rb',
+        'test/**/*',
         'bin/**/*',
         'ext/**/*',
         'examples/**/*',