[oe-commits] Martin Jansa : Merge remote branch 'origin/org.openembedded.dev' into shr/ merge

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Nov 11 18:45:36 2009 +0100

Merge remote branch 'origin/org.openembedded.dev' into shr/merge

Conflicts:
	conf/distro/include/preferred-shr-versions.inc
	conf/distro/shr.conf

---