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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Thu Dec 10 09:39:29 2009 +0100

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

Conflicts:
	recipes/moblin/librest_git.bb

---