Merge branch 'master' of git.opendreambox.org:/git/enigma2
authorthedoc <thedoc@atom.(none)>
Wed, 23 Dec 2009 20:59:37 +0000 (21:59 +0100)
committerthedoc <thedoc@atom.(none)>
Wed, 23 Dec 2009 20:59:37 +0000 (21:59 +0100)

Trivial merge