Merge branch 'bug_623_fix_advanced_diseqc_1.0' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 25 Nov 2010 22:31:54 +0000 (23:31 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 25 Nov 2010 22:31:54 +0000 (23:31 +0100)

Trivial merge