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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Mar 16 10:21:33 2010 +0100

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

Conflicts:
	recipes/ffmpeg/ffmpeg_0.5.bb
	recipes/ffmpeg/ffmpeg_git.bb

---