few tweaks on the last revision
Merge branch 'unstable' of github.com:mconf/chef-recipes into unstable