[oe-commits] Andreas Oberritter : Merge branch 'org.openembedded.dreambox' of git://git. openembedded.net/openembedded into org.openembedded.dreambox

[GIT User account]

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

Author: Andreas Oberritter <obi at saftware.de>
Date:   Mon Nov  3 05:16:13 2008 +0100

Merge branch 'org.openembedded.dreambox' of git://git.openembedded.net/openembedded into org.openembedded.dreambox

Conflicts:

	packages/enigma2/enigma2.bb

---