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

Merge ... '17057efdb800e46279b35519a9e48596acc03145'
     and '7c1f2774eda0a945488464d01c4a1231a72fec3b'
---

6df2418a18cd54934728e1e0ccc9b155c2abd910