puppetlabs/puppet — pull request #334 by daniel-pittman (2012-01-13 21:44:28+00:00)
Title: 2.7.x - merge 2.6.x branch up

This merges the changes on the 2.6.x branch up into the 2.7.x branch, including a hand-merge correcting an additional failure in the spec tests due to `SystemExit` needing to be caught in the newer branch.