[puppet/el6/master: 21/21] Merge branch 'master' into el6

[Todd Zullinger]

commit a75e7e3fc393360d881ac0a544b56b0c1e53203f
Merge: b3abce4 97a1f9e
Author: Todd Zullinger <tmz at pobox.com>
Date:   Thu Mar 17 11:59:53 2011 -0400

    Merge branch 'master' into el6

 .gitignore                                         |    6 +-
 ...-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 +++++++++++++
 puppet-0.25.5.tar.gz.sign                          |   17 --
 puppet-2.6.6.tar.gz.sign                           |   17 ++
 puppet.spec                                        |   80 +++++-
 sources                                            |    2 +-
 8 files changed, 668 insertions(+), 32 deletions(-)
---