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

Trivial merge