[puppet/el5: 3/3] Merge branch 'master' into el5

[Todd Zullinger]

commit abbb49443849a551f5158549f39254c85de84b99
Merge: 7fdf5fa 47fcf33
Author: Todd Zullinger <tmz at pobox.com>
Date:   Mon Oct 24 14:57:47 2011 -0400

    Merge branch 'master' into el5

 ...0244-Restore-Mongrel-XMLRPC-functionality.patch |  161 ++++++++++
 ...-t-truncate-remotely-sourced-files-on-404.patch |  273 ----------------
 ...ad-plugins-even-if-you-re-filtering-on-ta.patch |  123 --------
 ...ully-stub-Puppet-Resource-Reference-for-u.patch |  182 -----------
 ...Do-not-sent-tagmail-reports-if-no-changes.patch |   46 +++
 ...-Resist-directory-traversal-attacks-2.6.x.patch |  138 --------
 2.6.x-9791-TOCTOU-in-ssh-auth-keys-type.patch      |  107 -------
 ...2-Predictable-temporary-filename-in-ralsh.patch |   69 ----
 ...-indirector-file-backed-terminus-base-cla.patch |  330 --------------------
 ...gin-can-overwrite-arbitrary-files-as-root.patch |   40 ---
 puppet-2.6.12.tar.gz.asc                           |   17 +
 puppet-2.6.6.tar.gz.sign                           |   17 -
 puppet.spec                                        |   46 +--
 sources                                            |    2 +-
 14 files changed, 240 insertions(+), 1311 deletions(-)
---