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

[git version control]

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

Author: Felix Domke <tmbinc at 2mac.waldobjekt.org>
Date:   Tue Jun 16 20:53:40 2009 +0200

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

Conflicts:
	packages/dreambox/dreambox-secondstage.bb

---