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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Tue Nov 24 13:42:28 2009 +0100

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

Conflicts:
	recipes/opkg/opkg.inc

---