Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 27 Mar 2009 20:48:26 +0000 (21:48 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 27 Mar 2009 20:48:26 +0000 (21:48 +0100)

Trivial merge