Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorFelix Domke <felix.domke@multimedia-labs.de>
Thu, 27 Aug 2009 09:38:23 +0000 (11:38 +0200)
committerFelix Domke <felix.domke@multimedia-labs.de>
Thu, 27 Aug 2009 09:38:23 +0000 (11:38 +0200)

Trivial merge