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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Feb  1 10:48:32 2010 +0100

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

Conflicts:
	recipes/mplayer/mplayer_git.bb

---