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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Mar  8 17:28:06 2010 +0100

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

Conflicts:
	recipes/freesmartphone/fsodatad_git.bb
	recipes/shr/e-wm-theme-illume-neo_git.bb
	recipes/shr/elementary-theme-neo_git.bb
	recipes/shr/gtk-theme-neo_git.bb
	recipes/shr/icon-theme-neo_git.bb

---