chef repo made by knife-solo-0.3.0
Merge remote-tracking branch 'origin/master'