Merge branch 'bug_347_adenin_unicable_xml'
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 26 Nov 2010 11:55:18 +0000 (12:55 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 26 Nov 2010 11:55:18 +0000 (12:55 +0100)
1  2 
lib/dvb/sec.cpp

diff --cc lib/dvb/sec.cpp
Simple merge