Updated channellogos (20140808)
vdr: Modify .xinitrc if xinit's skeleton is installed, too
Merge branch 'master' into next

Conflicts:
	vdr/PKGBUILD