Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 12 Feb 2009 20:25:28 +0000 (21:25 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 12 Feb 2009 20:25:28 +0000 (21:25 +0100)

Trivial merge