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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Feb 20 14:52:50 2010 +0100

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

Conflicts:
	recipes/freesmartphone/fsomusicd_git.bb

---