Merge branch 'opendreambox' of git.opendreambox.org:git/opendreambox-1.6 into opendre...
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 23 Oct 2008 10:58:24 +0000 (12:58 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 23 Oct 2008 10:58:24 +0000 (12:58 +0200)

Trivial merge