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

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

Conflicts:

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

ce81a5820f712888529f7814ae11cce4ce3f6bd9
diff --cc packages/tasks/task-openmoko-feed.bb
index 9781d7beaf,c50b423887..ab11f61f81
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@@ -1,7 -1,7 +1,7 @@@
  DESCRIPTION = "Openmoko: Misc. Feed Items"
  SECTION = "openmoko/base"
  LICENSE = "MIT"
- PR = "r47"
 -PR = "r53"
++PR = "r54"
  
  inherit task