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

[GIT User account]

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

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

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

Conflicts:

	packages/tasks/task-openmoko-feed.bb

---