Merge branch 'org.openembedded.dreambox' of git://git.opendreambox.org/git/ghost...
authorFelix Domke <tmbinc@elitedvb.net>
Tue, 31 Mar 2009 17:10:12 +0000 (19:10 +0200)
committerFelix Domke <tmbinc@elitedvb.net>
Tue, 31 Mar 2009 17:10:12 +0000 (19:10 +0200)
Conflicts:

packages/enigma2/enigma2.bb


Trivial merge