From: Manuel Teira <manuel.teira@telefonica.net>
Date: Tue, 19 Jun 2007 15:59:19 +0000 (+0000)
Subject: merge of '7c858c6a8dfae412b188e58878fd0c0a05ceace0'
X-Git-Tag: Release-2010-05/1~8868^2~304^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1ab244c361defaa10c4aff18b3e6d779bbe07d61;p=openembedded.git

Merge ... '7c858c6a8dfae412b188e58878fd0c0a05ceace0'
     and 'c385046302747a8125b06bfe218d8d7facab5388'
---

1ab244c361defaa10c4aff18b3e6d779bbe07d61