From: Manuel Teira <manuel.teira@telefonica.net>
Date: Sun, 6 May 2007 18:16:06 +0000 (+0000)
Subject: merge of '3d3b8efee4f3f371f1f3681477f3c3b5c3f17b52'
X-Git-Tag: Release-2010-05/1~8868^2~621^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1fa8473a71adf7d995a45092b20846351e4b443;p=openembedded.git

Merge ... '3d3b8efee4f3f371f1f3681477f3c3b5c3f17b52'
     and '829ba9b3511d563a73ac9980eaa8861d2187d81e'
---

b1fa8473a71adf7d995a45092b20846351e4b443