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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Fri Nov 20 11:51:41 2009 +0100

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

Conflicts:
	recipes/freesmartphone/fso-apm_git.bb

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

---