Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorFelix Domke <felix.domke@multimedia-labs.de>
Fri, 14 Aug 2009 11:23:54 +0000 (13:23 +0200)
committerFelix Domke <felix.domke@multimedia-labs.de>
Fri, 14 Aug 2009 11:23:54 +0000 (13:23 +0200)
1  2 
lib/service/servicedvb.cpp

Simple merge