Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorFelix Domke <tmbinc@elitedvb.net>
Mon, 10 Nov 2008 21:38:01 +0000 (22:38 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Mon, 10 Nov 2008 21:38:01 +0000 (22:38 +0100)

Trivial merge