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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Mar 23 17:21:35 2010 +0100

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

Conflicts:
	recipes/x-load/x-load_git.bb

---