[oe-commits] Martin Jansa : Merge branch 'org.openembedded.dev' of git.openembedded.org: openembedded into martin_jansa/srcpv

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Dec 22 10:46:46 2009 +0100

Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into martin_jansa/srcpv

Conflicts:
	recipes/linux/linux-davinci_git.bb
	recipes/openbsc/openbsc_git.bb
	recipes/shr/phoneuid_git.bb

---