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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Mar  8 21:44:50 2010 +0100

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

Conflicts:
	recipes/freesmartphone/frameworkd_git.bb
	recipes/freesmartphone/libgsm0710mux_git.bb

---