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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Mar 11 11:45:39 2010 +0100

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

Conflicts:
	recipes/freesmartphone/fso-abyss_git.bb
	recipes/freesmartphone/libgsm0710mux_git.bb
	recipes/linux/linux-openmoko-2.6.32_git.bb
	recipes/qi/qi_git.bb
	recipes/xorg-driver/xf86-video-glamo_git.bb
	recipes/xorg-lib/pixman_git.bb

---