Merge branch 'bug_672_removed_pvr_device'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 16 Feb 2011 13:36:53 +0000 (14:36 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 16 Feb 2011 13:36:53 +0000 (14:36 +0100)
Conflicts:
lib/dvb/dvb.cpp


No differences found