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

[git version control]

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

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Mon Apr 12 10:50:02 2010 +0200

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

Conflicts:
	recipes/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb

---