[oe-commits] Klaus Kurzmann : Merge branch 'org.openembedded.dev' into shr/unstable

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Fri Feb 26 09:56:08 2010 +0100

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

Conflicts:
	recipes/freesmartphone/fso-abyss_git.bb
	recipes/freesmartphone/fsodatad_git.bb
	recipes/freesmartphone/fsogsmd_git.bb
	recipes/freesmartphone/fsousaged_git.bb
	recipes/freesmartphone/libfsobasics_git.bb
	recipes/freesmartphone/libfsoframework_git.bb
	recipes/freesmartphone/libfsoresource_git.bb
	recipes/freesmartphone/libfsotransport_git.bb

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---