From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 12 Apr 2007 13:14:14 +0000 (+0000)
Subject: merge of '05e24f5610763d569f2c11c8f26e2152e34063bb'
X-Git-Tag: Release-2010-05/1~8868^2~697
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3524b34212fdab21c6882324b85efcc65dd6238c;p=openembedded.git

Merge ... '05e24f5610763d569f2c11c8f26e2152e34063bb'
     and 'fc25101f37442915e9b2899a4383cb5bb412b44f'
---

3524b34212fdab21c6882324b85efcc65dd6238c