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

Merge ... '804eb98d8c897197185f143b02432c9d71be6caa'
     and 'febdd12e2deb46ea073d415b228a6fdd938968f3'
---

b88c680760aa4a4563e6a30a8b9edab310481246