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

[Todd Zullinger]

commit 58d384e14e189e0d04a7aeedbd354cf7a1bc427c
Merge: 3c3e8bd ebaa17f
Author: Todd Zullinger <tmz at pobox.com>
Date:   Thu Jul 19 13:04:14 2012 -0400

    Merge branch 'f16' into el6

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