From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Thu, 21 Jul 2005 21:38:58 +0000 (+0000)
Subject: merge of d23fa20efa477539bb55a99c02a96896167f1c2b
X-Git-Tag: Release-2010-05/1~9453^2~4092^2~5^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c0cb2cdfeeadc79a81ff78b3f74785c1dc11932;p=openembedded.git

merge of d23fa20efa477539bb55a99c02a96896167f1c2b
     and d974b2fdc2202ed227cf57f941cdb0b45b03cf15
---

3c0cb2cdfeeadc79a81ff78b3f74785c1dc11932