puppetlabs/puppet — pull request #904 by zaphod42 (2012-07-04 00:39:43+00:00)
Title: Maint/3.0rc/15307 fix puppet help with exceptional faces

This PR is a cleanup of PR #899. It also resolves the merge problems of getting it into 3.0rc.