Merge branch 'maint/master/ruby-1.9.3-support' of git://github.com/daniel-pittman/puppet

• 'maint/master/ruby-1.9.3-support' of git://github.com/daniel-pittman/puppet: Use conditional pending to block out "fails_on_windows" tests. Manually load Win32{API,OLE} for Ruby 1.9. Use a platform temporary file instead of a Unix one. Use platform path separator in tests. Make the base service provider spec work on Windows. Accept paths with ~ for generate on Windows. Make a path absolute on Windows as well as Unix. Store Rails logs on physical disk when testing. Recover better when maxgroups is not implemented. Forcibly remove temporary files in tests. Fix Rails schema setup on Windows. Make binwrite emulation work on Windows. Use Win32 API atomic replace in replace_file

Conflicts:
lib/puppet/util/execution.rb

Resolved whitespace conflict