fix segfault with partial autoconfiguration, when channel from config is missing
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/mumudvb.c
fix minor memory leaks
Merge remote-tracking branch 'upstream/master'
rewrite_eit: fix for software descrambling
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/mumudvb.c
	src/scam_common.c
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/rewrite_eit.c
merge with braice/MuMuDVB cleanups
impement buffer_func to take care of packets after demultiplexing channels
Remove the unused {hi, lo}_mappids variables.
rework the scrambled packet counting
Merge pull request #32 from ostryck/master

scam merge