Merge branch 'holger/openmoko-merges' into org.openembedded.dev
authorHolger Hans Peter Freyther <zecke@selfish.org>
Sun, 16 Nov 2008 15:19:05 +0000 (16:19 +0100)
committerHolger Hans Peter Freyther <zecke@selfish.org>
Sun, 16 Nov 2008 15:19:05 +0000 (16:19 +0100)
commit4cf709283530b333f18ca3530241dd0b73241b1f
tree7f3b125c3485041c0488adf60390a1fdb230bf6c
parentce5b19f9784561fb506bc564082e7a3d888a0c90
parent9eaf1493b3c777d688ad992b9ecedd1cc18cf147
Merge branch 'holger/openmoko-merges' into org.openembedded.dev

Conflicts:

packages/tasks/task-openmoko-feed.bb