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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Jan 13 01:00:13 2010 +0100

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

Conflicts:
	recipes/fbreader/fbreader_0.8.2a.bb

---