[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: c1a97cc59e538cc4a4cdcec907dd76e93701bb24
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c1a97cc59e538cc4a4cdcec907dd76e93701bb24

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Jan  9 01:55:47 2010 +0100

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

Conflicts:
	recipes/freesmartphone/fsonetworkd_git.bb
	recipes/freesmartphone/fsousaged_git.bb

---