Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorFelix Domke <felix.domke@multimedia-labs.de>
Thu, 3 Sep 2009 13:09:36 +0000 (15:09 +0200)
committerFelix Domke <felix.domke@multimedia-labs.de>
Thu, 3 Sep 2009 13:09:36 +0000 (15:09 +0200)

Trivial merge