Merge branch '1.0.x'
authorHunter Haugen <hunter@puppetlabs.com>
Thu, 19 Jun 2014 19:29:31 +0000 (12:29 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Thu, 19 Jun 2014 19:29:31 +0000 (12:29 -0700)

Trivial merge