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

[Todd Zullinger]

commit be14b81cd6fcf45628c415fffa14fc8cdcb3f589
Merge: 56a27e2 e29affe
Author: Todd Zullinger <tmz at pobox.com>
Date:   Wed Sep 28 10:03:05 2011 -0400

    Merge branch 'master' into el5

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