Merge branch '1.0.x'
authorHunter Haugen <hunter@puppetlabs.com>
Fri, 11 Jul 2014 21:29:15 +0000 (14:29 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Fri, 11 Jul 2014 21:29:15 +0000 (14:29 -0700)

Trivial merge