From: Manuel Teira <manuel.teira@telefonica.net>
Date: Wed, 9 May 2007 20:17:26 +0000 (+0000)
Subject: merge of '455cc00abecff1a53a78d22e04a9533677e950a7'
X-Git-Tag: Release-2010-05/1~8868^2~565^2~1^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=35622c4482821876efaa1b6299edb8edbbaac5c1;p=openembedded.git

Merge ... '455cc00abecff1a53a78d22e04a9533677e950a7'
     and '93a022ce4bed6cb6364be32b60eeca3833859ebd'
---

35622c4482821876efaa1b6299edb8edbbaac5c1