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

Trivial merge