Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 6 Jul 2009 10:04:02 +0000 (12:04 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 6 Jul 2009 10:04:02 +0000 (12:04 +0200)

Trivial merge