Update for Fedora 18.
Merge branch 'master' of github.com:easyLife/easylife-stuff

Conflicts:
	el_dlurls.txt