Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 6 May 2009 18:12:23 +0000 (20:12 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 6 May 2009 18:12:23 +0000 (20:12 +0200)

Trivial merge