Merge branch 'holger/openmoko-merges' into org.openembedded.dev
authorHolger Hans Peter Freyther <zecke@selfish.org>
Sun, 16 Nov 2008 00:09:51 +0000 (01:09 +0100)
committerHolger Hans Peter Freyther <zecke@selfish.org>
Sun, 16 Nov 2008 00:09:51 +0000 (01:09 +0100)
commitce81a5820f712888529f7814ae11cce4ce3f6bd9
treec6aa834d51accf4f4182bc0c7bfd93247c12607f
parent61d929464d8d345d5e0a4d6b1a9955c77f708e3c
parente13eb6ed3ee15de931a517361ad80f9248798873
Merge branch 'holger/openmoko-merges' into org.openembedded.dev

Conflicts:

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