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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sun Dec 13 23:02:36 2009 +0100

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

Conflicts:
	recipes/shr/phoneuid_git.bb

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

---