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

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

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

Conflicts:
	recipes/navit/navit.inc
	recipes/navit/navit_svn.bb
	recipes/shr/shr-wizard_git.bb

---