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

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: e2815b22622d1a05f4bf888f45839c5ef002243e
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=e2815b22622d1a05f4bf888f45839c5ef002243e

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Wed Dec  2 19:57:02 2009 +0100

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

Conflicts:
	recipes/freesmartphone/fso-apm_git.bb
	recipes/linux/linux-davinci_git.bb
	recipes/shr/shr-settings_git.bb

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

---