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

[Todd Zullinger]

commit 164799e66c4eeb1f2b2ae6513c2ed58be2e318be
Merge: eb50e17 04a1f39
Author: Todd Zullinger <tmz at pobox.com>
Date:   Thu Jan 5 01:10:16 2012 -0500

    Merge branch 'master' into el6

 ...0244-Restore-Mongrel-XMLRPC-functionality.patch |  161 --------------------
 puppet-2.6.12.tar.gz.asc                           |   17 --
 puppet-2.6.13-augeas-0.10.patch                    |   60 ++++++++
 puppet-2.6.13.tar.gz.asc                           |   18 +++
 puppet.spec                                        |   18 ++-
 sources                                            |    2 +-
 6 files changed, 92 insertions(+), 184 deletions(-)
---