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

[git version control]

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

Author: Felix Domke <tmbinc at elitedvb.net>
Date:   Thu Apr  9 11:20:34 2009 +0200

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

Conflicts:

	packages/dreambox/dreambox-secondstage.bb
	packages/initscripts/initscripts-opendreambox_1.0.bb

---