Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master
authorAndreas Oberritter <obi@saftware.de>
Wed, 19 Aug 2009 12:04:39 +0000 (14:04 +0200)
committerAndreas Oberritter <obi@saftware.de>
Wed, 19 Aug 2009 12:04:39 +0000 (14:04 +0200)

Trivial merge