[oe-commits] Martin Jansa : Merge remote branch 'origin/martin_jansa/srcpv' into shr/ merge

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Nov 20 13:48:07 2009 +0100

Merge remote branch 'origin/martin_jansa/srcpv' into shr/merge

Conflicts:
	recipes/freesmartphone/fso-apm_git.bb

---