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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sat Mar 13 20:04:12 2010 +0100

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

Conflicts:
	recipes/freesmartphone/msmcommd_git.bb

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

---