Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 11 Mar 2009 07:49:47 +0000 (08:49 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 11 Mar 2009 07:49:47 +0000 (08:49 +0100)

Trivial merge