From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 3 Aug 2007 11:16:04 +0000 (+0000)
Subject: merge of '5825a3b31a4da8bd899bac6fef5c9f16e34dc883'
X-Git-Tag: Release-2010-05/1~8868^2~32^2^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cbdccd40595f14780870984264ac99275d699870;p=openembedded.git

Merge ... '5825a3b31a4da8bd899bac6fef5c9f16e34dc883'
     and '8d78f48d5027db6d0772303acb59044c4fbcfdbb'
---

cbdccd40595f14780870984264ac99275d699870