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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Jan 24 00:39:04 2010 +0100

Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into shr/unstable

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

---