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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sun Dec 13 13:26:19 2009 +0100

Merge branch 'org.openembedded.dev' into martin_jansa/srcpv

Conflicts:
	recipes/shr/e-wm-config-illume-shr_git.bb
	recipes/shr/phonefsod_git.bb
	recipes/shr/phoneuid_git.bb

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

---