From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Mon, 14 Aug 2006 23:20:25 +0000 (+0000)
Subject: merge of 04264e63d95f7b157030356df1acd2c861ecf54d
X-Git-Tag: Release-2010-05/1~9453^2~957^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=772c2ab08055ad87972bbeb00c3c78c801148ec0;p=openembedded.git

merge of 04264e63d95f7b157030356df1acd2c861ecf54d
     and 0fb74741994c40f954b3aef2f855c14636c49ccb
---

772c2ab08055ad87972bbeb00c3c78c801148ec0