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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Nov 22 17:47:23 2009 +0100

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

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

---