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

Merge ... '67942eb62303bea5aa0c7a5139253cfd81baf2b0'
     and 'f72ecadd8bf2ede2c7c77aa975cb2b763628e511'
---

ae7d1e6a31217e163066e1530b3682989663667e