Merge branch 'org.openembedded.dreambox' of git://git.opendreambox.org/git/ghost...
authorFelix Domke <felix.domke@multimedia-labs.de>
Mon, 17 Aug 2009 21:35:19 +0000 (23:35 +0200)
committerFelix Domke <felix.domke@multimedia-labs.de>
Mon, 17 Aug 2009 21:35:19 +0000 (23:35 +0200)

Trivial merge