puppetlabs/puppet — pull request #335 by daniel-pittman (2012-01-13 23:59:41+00:00)
Title: master - merge 2.7.x branch

This merges the changes from the 2.7 (and, implicitly, 2.6) branches into master.