Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 10 Mar 2009 11:04:49 +0000 (12:04 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 10 Mar 2009 11:04:49 +0000 (12:04 +0100)

Trivial merge