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

Conflicts:

packages/tasks/task-openmoko-feed.bb