From: Manuel Teira <manuel.teira@telefonica.net>
Date: Sat, 5 May 2007 21:23:01 +0000 (+0000)
Subject: merge of '25c9bf8030ed9b081cb15b534fe5dbd9bf20ad4e'
X-Git-Tag: Release-2010-05/1~8868^2~624^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb6dc547215e358b86ae66fb6cef0453afbef287;p=openembedded.git

Merge ... '25c9bf8030ed9b081cb15b534fe5dbd9bf20ad4e'
     and '7d71de2436fb40872b9112c4711153f3f0138e15'
---

eb6dc547215e358b86ae66fb6cef0453afbef287