Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorFelix Domke <felix.domke@multimedia-labs.de>
Fri, 17 Jul 2009 10:46:44 +0000 (12:46 +0200)
committerFelix Domke <felix.domke@multimedia-labs.de>
Fri, 17 Jul 2009 10:46:44 +0000 (12:46 +0200)

Trivial merge