[oe-commits] Martin Jansa : Merge remote branch 'origin/org.openembedded.dev' into shr/ unstable

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 4ffb9a9d93c1f9475ddf722e5789de300729128f
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4ffb9a9d93c1f9475ddf722e5789de300729128f

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Jan 28 09:59:37 2010 +0100

Merge remote branch 'origin/org.openembedded.dev' into shr/unstable

Conflicts:
	recipes/freesmartphone/fsonetworkd_git.bb
	recipes/freesmartphone/libfsobasics_git.bb
	recipes/freesmartphone/libfsoframework_git.bb
	recipes/xorg-driver/xf86-video-omapfb_git.bb

---