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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sat Apr  3 19:00:57 2010 +0200

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

Conflicts:
	recipes/freesmartphone/libfso-glib_git.bb

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

---