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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Nov  8 17:26:37 2009 +0100

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

Conflicts:
	conf/checksums.ini
	recipes/vala/vala-native_0.7.8.bb
	recipes/vala/vala_0.7.8.bb

---