[oe-commits] Felix Domke : Merge branch 'org.openembedded.dreambox' of git://git. opendreambox.org/git/ghost/opendreambox-1.5 into org.openembedded.dreambox

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dreambox
Commit: 739e077cecc32180970115566f95a15cc1e6ea79
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=739e077cecc32180970115566f95a15cc1e6ea79

Author: Felix Domke <tmbinc at elitedvb.net>
Date:   Tue Mar 31 19:10:12 2009 +0200

Merge branch 'org.openembedded.dreambox' of git://git.opendreambox.org/git/ghost/opendreambox-1.5 into org.openembedded.dreambox

Conflicts:

	packages/enigma2/enigma2.bb

---