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

[git version control]

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

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

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

Conflicts:
	conf/distro/include/sane-srcrevs.inc
	conf/machine/om-gta01.conf
	conf/machine/om-gta02.conf
	recipes/linux/linux-davinci_git.bb

---