Merge branch 'master' of git+ssh://scm.schwerkraft.elitedvb.net/scmrepos/git/enigma2...
author3c5x9 <3c5x9@gmx.net>
Fri, 4 Feb 2011 18:34:48 +0000 (10:34 -0800)
committer3c5x9 <3c5x9@gmx.net>
Fri, 4 Feb 2011 18:34:48 +0000 (10:34 -0800)

Trivial merge