[oe-commits] Klaus Kurzmann : Merge commit 'origin/org.openembedded.dev' into shr/merge

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sat Oct 31 10:38:50 2009 +0100

Merge commit 'origin/org.openembedded.dev' into shr/merge

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

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---