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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Dec 29 19:34:38 2009 +0100

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

Conflicts:
	recipes/shr/shr-installer_git.bb

---