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

Merge ... '12fa8ef0c447968799315a8b55e6d534dbf250ab'
     and '3ddc510cdb4a7a971e3055493514bb560f25a7d9'
---

f1207ed09f49d66754ed00a9e03b52b3523c9cd2