[oe-commits] Klaus Kurzmann : Merge remote branch 'origin/org.openembedded.dev' into srcpv

[git version control]

Module: openembedded.git
Branch: srcpv
Commit: 374f8816d09dcca63d1c708454d96149dcc8b1c9
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=374f8816d09dcca63d1c708454d96149dcc8b1c9

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Fri Nov 27 14:14:05 2009 +0100

Merge remote branch 'origin/org.openembedded.dev' into srcpv

Conflicts:
	recipes/linux/linux-openmoko-shr-devel_git.bb
	recipes/shr/e-wm-menu-shr_git.bb
	recipes/shr/phonefsod_git.bb
	recipes/shr/phoneuid_git.bb

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---