Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorFelix Domke <tmbinc@elitedvb.net>
Thu, 15 Jan 2009 23:48:46 +0000 (00:48 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Thu, 15 Jan 2009 23:48:46 +0000 (00:48 +0100)

Trivial merge