puppetlabs/puppet — pull request #299 by mmrobins (2012-01-03 19:50:44+00:00)
Title: Fix augeas_spec branch merging mistake

spec/unit/provider/augeas/augeas_spec.rb had merge conflicts when I
merged 2.7.x into master. I resolved them incorrectly at first, then
forgot to add the fixed resolution to the merge commit before pushing,
so all the tests passed on my local machine. This corrects that merge
resolution so that tests all pass.