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

[Todd Zullinger]

commit 56a27e2ba969f0d6210a8b1881d12a1331acf136
Merge: 22060e8 97a1f9e
Author: Todd Zullinger <tmz at pobox.com>
Date:   Thu Mar 17 12:00:08 2011 -0400

    Merge branch 'master' into el5

 .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(-)
---