[oe-commits] Klaus Kurzmann : Merge branch 'org.openembedded.dev' into shr/merge

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Thu Oct 22 11:29:40 2009 +0200

Merge branch 'org.openembedded.dev' into shr/merge

Conflicts:
	conf/checksums.ini
	recipes/libgee/libgee-native_git.bb
	recipes/xorg-lib/pixman_0.16.2.bb

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---