Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 8 Jun 2009 20:56:25 +0000 (22:56 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 8 Jun 2009 20:56:25 +0000 (22:56 +0200)

Trivial merge