centos6 / install smokeping
Merge branch 'master' of github.com:fazie/fazie-receipes

Conflicts:
	sys/centos6/install-smokeping.sh