From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Sun, 16 Nov 2008 15:35:39 +0000 (+0100)
Subject: Merge commit 'origin/org.openembedded.dev' into holger/openmoko-merges
X-Git-Tag: Release-2010-05/1~5310^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52abe8d77cbfed9c91a9cae7ed0a7e60aaf50b34;p=openembedded.git

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

Conflicts:

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

52abe8d77cbfed9c91a9cae7ed0a7e60aaf50b34