Merge branch 'opendreambox' into opendreambox-1.6
authorghost <andreas.monzner@multimedia-labs.de>
Sat, 11 Dec 2010 00:59:42 +0000 (01:59 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Sat, 11 Dec 2010 00:59:42 +0000 (01:59 +0100)

Trivial merge