Merge pull request #89 from tjormola/tjormola

Add two channels on Thor5/6 and add some new PIDs
update
update
update
update
update
update
update
update
update
update
update
update
UMKBW: new channels as of 2013-01-15
Merge pull request #93 from herrnst/pr-umkbw-20130115

UMKBW: new channels as of 2013-01-15
update
update
update
update
update