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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Dec  6 11:58:46 2009 +0100

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

Conflicts:
	conf/distro/include/sane-srcrevs.inc
	recipes/navit/files/osd.xml
	recipes/navit/navit.inc
	recipes/navit/navit_svn.bb

---