Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 7 May 2009 06:17:59 +0000 (08:17 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 7 May 2009 06:17:59 +0000 (08:17 +0200)

Trivial merge