Merge branch 'bug_672_removed_pvr_device'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 16 Feb 2011 17:41:08 +0000 (18:41 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 16 Feb 2011 17:41:08 +0000 (18:41 +0100)
1  2 
lib/dvb/decoder.cpp

Simple merge