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

Conflicts:

	packages/tasks/task-openmoko-feed.bb

diff --cc packages/tasks/task-openmoko-feed.bb
index 9781d7beaf8a226428f1e3b66a39a0a26a3b2806,c50b4238878502e7255fb82b74b50b90660b97fa..ab11f61f81f0568a9e3b40dd1ca0ae3c64491ef5
--- 1/packages/tasks/task-openmoko-feed.bb
--- 2/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