Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 27 Oct 2009 17:07:51 +0000 (18:07 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 27 Oct 2009 17:07:51 +0000 (18:07 +0100)

Trivial merge