Merge branch 'master' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 25 Nov 2010 15:15:47 +0000 (16:15 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 25 Nov 2010 15:15:47 +0000 (16:15 +0100)
1  2 
lib/service/servicedvb.cpp

Simple merge