Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 13 Sep 2011 08:56:19 +0000 (10:56 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 13 Sep 2011 08:56:19 +0000 (10:56 +0200)

Trivial merge