From: Manuel Teira <manuel.teira@telefonica.net>
Date: Wed, 9 May 2007 18:39:33 +0000 (+0000)
Subject: merge of '65189cecfff58dc8675ff2bd51e04754045b3402'
X-Git-Tag: Release-2010-05/1~8868^2~565^2~3
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f5b0cdbf27ea2320ebd9c69945c209620dea8b1;p=openembedded.git

Merge ... '65189cecfff58dc8675ff2bd51e04754045b3402'
     and 'f21d1e4f099c8aa5f4d101d7436b5f27bfbfc829'
---

4f5b0cdbf27ea2320ebd9c69945c209620dea8b1