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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Mar 16 13:35:25 2010 +0100

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

Conflicts:
	recipes/mplayer/mplayer_git.bb

---