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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Nov 12 09:34:35 2009 +0100

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

Conflicts:
	conf/distro/include/sane-srcrevs-fso.inc
	conf/distro/include/sane-srcrevs.inc

---