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

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Mon Nov 30 14:48:43 2009 +0100

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

Conflicts:
	recipes/linux/linux-davinci_git.bb

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

---