Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master
authorghost <andreas.monzner@multimedia-labs.de>
Sun, 6 Sep 2009 07:16:16 +0000 (09:16 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Sun, 6 Sep 2009 07:16:16 +0000 (09:16 +0200)

Trivial merge