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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Apr 19 01:31:18 2010 +0200

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

Conflicts:
	recipes/freesmartphone/fsodatad_git.bb
	recipes/freesmartphone/fsodeviced_git.bb
	recipes/linux/linux-openmoko-2.6.24_git.bb
	recipes/linux/linux-openmoko-2.6.28_git.bb
	recipes/linux/linux-openmoko-devel_git.bb
	recipes/xorg-lib/pixman_git.bb
	recipes/xorg-xserver/xserver-xorg_git.bb

---