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

[git version control]

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

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

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

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

---