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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Apr 12 20:32:59 2010 +0200

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

Conflicts:
	recipes/gpephone/ptim-engine_1.0.bb
	recipes/gpephone/ptim-headers_1.0.bb
	recipes/gpephone/ptim-manager_1.0.bb
	recipes/xorg-xserver/xserver-kdrive-glamo_1.3.0.0+git.bb

---