Merge remote-tracking branch 'schischu/master'

Conflicts:
	configs/ptxconfig_e2_libeplayer
	rules/misc.in