Merge remote branch 'origin/bug_380_stop_service_entering_tuner_setup'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 27 Jan 2010 09:51:41 +0000 (10:51 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 27 Jan 2010 09:51:41 +0000 (10:51 +0100)

Trivial merge