From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 13 Apr 2007 07:11:09 +0000 (+0000)
Subject: merge of '0b31bda390691b7d9e15f77a2ea3e3705bbf2f12'
X-Git-Tag: Release-2010-05/1~8868^2~689^2~23^2~11
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c4198c0a4330347a88583da3dd7cc0c1e7b9a0d0;p=openembedded.git

Merge ... '0b31bda390691b7d9e15f77a2ea3e3705bbf2f12'
     and '5bcded2dc238545b2379f23a18eda0fc75732a6b'
---

c4198c0a4330347a88583da3dd7cc0c1e7b9a0d0