add cronie for centos
Merge remote branch 'origin/master'
update with upstream
Merge branch 'master' of git://github.com/phunehehe/chef-cookbooks into shorewall