Merge branch 'master' of git.opendreambox.org:/git/enigma2 into acid-burn/network_cha...
authorMladen Horvat <acid-burn@opendreambox.org>
Wed, 13 Apr 2011 14:17:43 +0000 (16:17 +0200)
committerMladen Horvat <acid-burn@opendreambox.org>
Wed, 13 Apr 2011 14:17:43 +0000 (16:17 +0200)

Trivial merge