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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Mar 16 17:30:19 2010 +0100

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

Conflicts:
	recipes/shr/phoneui-shr-theme-neo_git.bb
	recipes/xorg-lib/pixman_git.bb

---