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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Jan 30 21:13:25 2010 +0100

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

Conflicts:
	recipes/xorg-lib/pixman_git.bb

---