Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 30 Jun 2009 07:34:05 +0000 (09:34 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 30 Jun 2009 07:34:05 +0000 (09:34 +0200)

Trivial merge