Merge branch 'org.openembedded.dreambox' of git://git.opendreambox.org/git/ghost...
authorFelix Domke <felix.domke@multimedia-labs.de>
Fri, 17 Jul 2009 15:09:57 +0000 (17:09 +0200)
committerFelix Domke <felix.domke@multimedia-labs.de>
Fri, 17 Jul 2009 15:09:57 +0000 (17:09 +0200)

Trivial merge