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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Mar 31 21:21:47 2010 +0200

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

Conflicts:
	recipes/shr/phoneui-shr-theme-neo_git.bb
	recipes/shr/phoneui-shr-theme-o2_git.bb

---