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

[GIT User account]

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

Author: Felix Domke <tmbinc at elitedvb.net>
Date:   Wed Jan 21 13:33:30 2009 +0100

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

Conflicts:

	packages/enigma2/enigma2.bb

---