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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Mar  1 17:01:47 2010 +0100

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

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

---