[puppet/el5: 2/2] Merge branch 'f16' into el5

[Todd Zullinger]

commit abf925745658f5bd4439ac425f2503d438a62308
Merge: f8aee42 ebaa17f
Author: Todd Zullinger <tmz at pobox.com>
Date:   Thu Jul 19 13:04:29 2012 -0400

    Merge branch 'f16' into el5

 puppet.spec |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
---