Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 1 Oct 2009 19:28:39 +0000 (21:28 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 1 Oct 2009 19:28:39 +0000 (21:28 +0200)

Trivial merge