Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorFelix Domke <felix.domke@multimedia-labs.de>
Thu, 16 Jul 2009 21:41:52 +0000 (23:41 +0200)
committerFelix Domke <felix.domke@multimedia-labs.de>
Thu, 16 Jul 2009 21:41:52 +0000 (23:41 +0200)

Trivial merge