Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Sat, 3 Jan 2009 09:36:52 +0000 (10:36 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Sat, 3 Jan 2009 09:36:52 +0000 (10:36 +0100)

Trivial merge