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

Merge ... '06791c441f033cb517879b4808eb801c21997a09'
     and '3ba42b444ce34355fb2aa1f92bfea0b8b15018d4'
---

87794441458ab30060bf947dc354cb79617e70ee