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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Nov 19 20:53:28 2009 +0100

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

Conflicts:
	conf/bitbake.conf

---