From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 16 Nov 2008 15:19:05 +0000 (+0100)
Subject: Merge branch 'holger/openmoko-merges' into org.openembedded.dev
X-Git-Tag: Release-2010-05/1~5311
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cf709283530b333f18ca3530241dd0b73241b1f;p=openembedded.git

Merge branch 'holger/openmoko-merges' into org.openembedded.dev

Conflicts:

	packages/tasks/task-openmoko-feed.bb
---

4cf709283530b333f18ca3530241dd0b73241b1f