[oe-commits] Holger Hans Peter Freyther : Merge branch 'holger/openmoko-merges' into org .openembedded.dev

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: ce81a5820f712888529f7814ae11cce4ce3f6bd9
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=ce81a5820f712888529f7814ae11cce4ce3f6bd9

Author: Holger Hans Peter Freyther <zecke at selfish.org>
Date:   Sun Nov 16 01:09:51 2008 +0100

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

Conflicts:

	packages/tasks/task-openmoko-feed.bb

---