Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 20 Aug 2009 06:33:11 +0000 (08:33 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 20 Aug 2009 06:33:11 +0000 (08:33 +0200)

Trivial merge