[puppet: 5/5] Merge branch 'f18'

[Michael Stahnke]

commit ba611d69899884c35136baf6fb981c293d8ce146
Merge: d1a6c22 3988548
Author: Michael Stahnke <stahnma at puppetlabs.com>
Date:   Thu Mar 7 17:47:12 2013 -0800

    Merge branch 'f18'

 puppet.spec |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---