Merge branch 'master' of git://github.com/CyanogenMod/hudson

Conflicts:
	cm-build-targets