From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Sun, 6 Aug 2006 13:18:48 +0000 (+0000)
Subject: merge of 235bdc3ae0f87feaab2e0933bfdb44645a492c5e
X-Git-Tag: Release-2010-05/1~9453^2~999^2~22
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e46b9eb91fa93a94580e274719f4c7d713eae6e2;p=openembedded.git

merge of 235bdc3ae0f87feaab2e0933bfdb44645a492c5e
     and 2ec546354ed54e5800bc57d56a12bbe7ecb4ccdd
---

e46b9eb91fa93a94580e274719f4c7d713eae6e2