Merge branch 'master' of acidburn@git.opendreambox.org:/git/enigma2 into bug_218_simp...
authoracid-burn <acid-burn@opendreambox.org>
Fri, 29 Jan 2010 07:59:05 +0000 (08:59 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Fri, 29 Jan 2010 07:59:05 +0000 (08:59 +0100)

Trivial merge