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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Mar  5 10:40:09 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/xorg-driver/xf86-video-omapfb_git.bb

---