Merge branch 'master' of /git/enigma2
authoracid-burn <acidburn@opendreambox.org>
Wed, 7 Oct 2009 10:16:11 +0000 (10:16 +0000)
committeracid-burn <acidburn@opendreambox.org>
Wed, 7 Oct 2009 10:16:11 +0000 (10:16 +0000)

Trivial merge