Merge branch 'release_1.0.1' into 1.0.x
authorHunter Haugen <hunter@puppetlabs.com>
Wed, 18 Jun 2014 16:02:16 +0000 (09:02 -0700)
committerHunter Haugen <hunter@puppetlabs.com>
Wed, 18 Jun 2014 16:02:16 +0000 (09:02 -0700)

Trivial merge