[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: 4cf709283530b333f18ca3530241dd0b73241b1f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4cf709283530b333f18ca3530241dd0b73241b1f

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

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

Conflicts:

	packages/tasks/task-openmoko-feed.bb

---