From: Kristoffer Ericson <kristoffer_e1@hotmail.com>
Date: Thu, 5 Apr 2007 07:03:57 +0000 (+0000)
Subject: merge of '12528b74949ac903af2d3960e26a8ede5eaa5648'
X-Git-Tag: Release-2010-05/1~8868^2~771^2^2~12
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad96365837fb18c9517b5c9399526869165b7ec2;p=openembedded.git

Merge ... '12528b74949ac903af2d3960e26a8ede5eaa5648'
     and '88e7fc4e578d475704012a657d1e7ab9ddf30a7d'
---

ad96365837fb18c9517b5c9399526869165b7ec2