[oe-commits] Martin Jansa : Merge branch 'org.openembedded.dev' of git.openembedded.org: openembedded into martin_jansa/srcpv

[git version control]

Module: openembedded.git
Branch: martin_jansa/srcpv
Commit: 4a66d065b44584e100eef1feed7626f6268a9132
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=4a66d065b44584e100eef1feed7626f6268a9132

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Jan  6 23:41:56 2010 +0100

Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into martin_jansa/srcpv

Conflicts:
	recipes/freesmartphone/fsomusicd_git.bb

---