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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Mar 26 08:41:50 2010 +0100

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

Conflicts:
	recipes/ffalarms/ffalarms_git.bb
	recipes/obsolete/shr/alsa-scenarii-shr_git.bb

---