Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master
authorFelix Domke <[email protected]>
Wed, 27 May 2009 22:25:38 +0000 (00:25 +0200)
committerFelix Domke <[email protected]>
Wed, 27 May 2009 22:25:38 +0000 (00:25 +0200)

Trivial merge