Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorFelix Domke <felix.domke@multimedia-labs.de>
Sun, 9 Aug 2009 15:56:31 +0000 (17:56 +0200)
committerFelix Domke <felix.domke@multimedia-labs.de>
Sun, 9 Aug 2009 15:56:31 +0000 (17:56 +0200)

Trivial merge