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)
commitd0cddddad18d416957a0cd37d343312f72818acc
treed83dd2c7e42a417ef365e0de2665069c8bc3cbf3
parentcdfd7a570b5b0813c8f62fc76deed949d7a11803
parent93979892e9d66d3f31b84ac0e3399e95a77f76c2
Merge branch 'master' into experimental
lib/service/servicedvb.cpp