[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: 75e76a70bd4d5d3ade415129dbd858a4649dc658
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=75e76a70bd4d5d3ade415129dbd858a4649dc658

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Dec 27 18:42:36 2009 +0100

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

Conflicts:
	recipes/freesmartphone/fso-specs_git.bb
	recipes/linux/linux-davinci_git.bb

---