From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Tue, 22 Aug 2006 14:36:33 +0000 (+0000)
Subject: merge of 7977b8ce284c880bc8392583f70a410d660e9c7f
X-Git-Tag: Release-2010-05/1~9453^2~911^2~16^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42f62365a7105338af3aa5f7f0345d7ca651a968;p=openembedded.git

merge of 7977b8ce284c880bc8392583f70a410d660e9c7f
     and bd9490f3e5b47d7aa5f58032d480a8d192520a4b
---

42f62365a7105338af3aa5f7f0345d7ca651a968