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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Wed Nov 25 17:28:21 2009 +0100

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

Conflicts:
	recipes/freesmartphone/libfsoframework_git.bb

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

---