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)
Conflicts:

packages/tasks/task-openmoko-feed.bb


Trivial merge