Merge branch '2.6' of git.opendreambox.org:/git/enigma2 into 2.6
authorghost <andreas.monzner@multimedia-labs.de>
Mon, 16 Nov 2009 10:04:28 +0000 (11:04 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Mon, 16 Nov 2009 10:04:28 +0000 (11:04 +0100)

Trivial merge