this blocks local for 10 minutes
Merge pull request #379 from carck/master

this blocks chef-solo for 10 minutes