[oe-commits] Martin Jansa : Merge commit 'origin/org.openembedded.dev' into shr/unstable

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Feb 11 14:34:29 2010 +0100

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

Conflicts:
	recipes/linux/linux-openmoko-2.6.32_git.bb

---