the diff was supposed to be applied to sysutils/puppet-devel, NOT sysutils/puppet. Please do NOT commit the diff, or close this PR as invalid. I'll send the new diff for sysutils/puppet-devel soon. -- Tomoyuki Sakurai