Merge branch 'org.openembedded.dreambox' of git://git.opendreambox.org/git/ghost...
authorFelix Domke <tmbinc@2mac.waldobjekt.org>
Tue, 7 Jul 2009 10:52:30 +0000 (12:52 +0200)
committerFelix Domke <tmbinc@2mac.waldobjekt.org>
Tue, 7 Jul 2009 10:52:30 +0000 (12:52 +0200)

Trivial merge