Merge branch 'missed_one' into 1.4.x
authorHunter Haugen <hunter@puppetlabs.com>
Tue, 25 Feb 2014 19:12:40 +0000 (11:12 -0800)
committerHunter Haugen <hunter@puppetlabs.com>
Tue, 25 Feb 2014 19:12:40 +0000 (11:12 -0800)

Trivial merge