Merge branch 'master' of github.com:lielongxingkong/devceph

Conflicts:
	devceph.sh
	el6.repo/ceph-extras.repo
Merge branch 'master' of github.com:lielongxingkong/devceph

Conflicts:
	devceph.sh