[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: shr/merge
Commit: 682b7f8cbc3fa8c2fe02ee115711f0162e75452a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=682b7f8cbc3fa8c2fe02ee115711f0162e75452a

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Dec  4 11:27:51 2009 +0100

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

Conflicts:
	recipes/u-boot/u-boot-omap3pandora_git.bb
	recipes/x-load/x-load-omap3pandora_git.bb

---