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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Jan 21 08:53:18 2010 +0100

Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into shr/unstable

Conflicts:
	recipes/xorg-lib/pixman_git.bb

---