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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Feb 15 00:33:53 2010 +0100

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

Conflicts:
	recipes/evopedia/evopedia_git.bb

---