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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Mar 31 22:21:16 2010 +0200

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

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

---