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

[GIT User account]

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

Author: Felix Domke <tmbinc at elitedvb.net>
Date:   Tue Nov 25 23:27:19 2008 +0100

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

Conflicts:

	packages/base-files/base-files_3.0.14.bb

---