Merge branch 'opendreambox' of git://git.opendreambox.org/git/ghost/opendreambox...
authorFelix Domke <tmbinc@elitedvb.net>
Thu, 30 Oct 2008 00:08:11 +0000 (01:08 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Thu, 30 Oct 2008 00:08:11 +0000 (01:08 +0100)

Trivial merge