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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Fri Apr  2 00:30:34 2010 +0200

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

Conflicts:
	recipes/efl1/libeflvala_svn.bb
	recipes/ezx/ezx-gen-blob_svn.bb
	recipes/gpephone/libcalenabler2_svn.bb
	recipes/gpephone/libiac2_svn.bb
	recipes/gpephone/libiac_svn.bb
	recipes/xorg-lib/libxcalibrate_git.bb

---