Merge branch 'master' into enigma2_rel25
authorghost <[email protected]>
Tue, 2 Dec 2008 20:44:34 +0000 (21:44 +0100)
committerghost <[email protected]>
Tue, 2 Dec 2008 20:44:34 +0000 (21:44 +0100)

Trivial merge