From: Marcin Juszkiewicz <hrw@openembedded.org>
Date: Fri, 13 Jan 2006 12:32:19 +0000 (+0000)
Subject: merge of 1ac9a4a5dc21044643760bdc04d49ea3b67e2fe9
X-Git-Tag: Release-2010-05/1~9453^2~2670
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d3db6716cb221a16011af6f6d40c6ae17c766990;p=openembedded.git

merge of 1ac9a4a5dc21044643760bdc04d49ea3b67e2fe9
     and 89b50baece913cead5c49dc80063b2541dcad4cd
---

d3db6716cb221a16011af6f6d40c6ae17c766990