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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Jan  5 10:15:29 2010 +0100

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

Conflicts:
	recipes/freesmartphone/fsotimed_git.bb
	recipes/freesmartphone/libfsoframework_git.bb
	recipes/libnl/libnl2_git.bb
	recipes/linux/linux-openmoko-2.6.31_git.bb
	recipes/linux/linux-openmoko-2.6.32_git.bb
	recipes/linux/linux-openmoko-shr-devel_git.bb
	recipes/linux/linux-openmoko-shr-drm-devel_git.bb

---