Merge commit 'origin/master' into enigma2_rel25
authorghost <[email protected]>
Wed, 26 Nov 2008 19:29:17 +0000 (20:29 +0100)
committerghost <[email protected]>
Wed, 26 Nov 2008 19:29:17 +0000 (20:29 +0100)

Trivial merge