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

[Todd Zullinger]

commit f97d4d9cfedb06e9c50cbc795ef71941ad954600
Merge: a75e7e3 e29affe
Author: Todd Zullinger <tmz at pobox.com>
Date:   Wed Sep 28 10:02:35 2011 -0400

    Merge branch 'master' into el6

 ...-Resist-directory-traversal-attacks-2.6.x.patch |  138 ++++++++++++++++++++
 puppet.spec                                        |   10 +-
 2 files changed, 146 insertions(+), 2 deletions(-)
---