Merge branch 'master' of git://git.opendreambox.org/git/enigma2
authorMladen Horvat <acidburn@opendreambox.org>
Fri, 7 Nov 2008 19:20:51 +0000 (20:20 +0100)
committerMladen Horvat <acidburn@opendreambox.org>
Fri, 7 Nov 2008 19:20:51 +0000 (20:20 +0100)

Trivial merge