Merge commit 'fccfbd2f^1'

Signed-off-by: HIRANO Takahito <hiranotaka@zng.info>

Conflicts:
	modules/demux/Modules.am
vlc_dvbpsi_reset deleted a wrong program.

Signed-off-by: HIRANO Takahito <hiranotaka@zng.info>