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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Feb 19 01:04:12 2010 +0100

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

Conflicts:
	recipes/dri/libdrm_git.bb
	recipes/gpe-icons/gpe-theme-neo_git.bb
	recipes/mesa/mesa-dri_git.bb
	recipes/shr/e-wm-theme-illume-neo_git.bb
	recipes/shr/elementary-theme-neo_git.bb
	recipes/shr/etk-theme-neo_git.bb
	recipes/shr/gtk-theme-neo_git.bb
	recipes/shr/icon-theme-neo_git.bb
	recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb
	recipes/xorg-driver/xf86-video-glamo_git.bb
	recipes/xorg-xserver/xserver-xorg_git.bb

---