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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Jan 11 16:59:16 2010 +0100

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

Conflicts:
	recipes/freesmartphone/fsodatad_git.bb
	recipes/freesmartphone/fsogsmd_git.bb
	recipes/freesmartphone/fsonetworkd_git.bb
	recipes/freesmartphone/fsotdld_git.bb
	recipes/freesmartphone/fsousaged_git.bb

---