Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 18 Dec 2008 17:08:23 +0000 (18:08 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 18 Dec 2008 17:08:23 +0000 (18:08 +0100)

Trivial merge