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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Jan  9 22:53:24 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/fsotdld_git.bb

---