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

Merge ... '80cb1accdd731a62c0845946a28fde1f35e82d1f'
     and 'fb1d8d05881bde082243b8b1fbc739f8a9fab90b'
---

b94ac129fe9da3a0d1fbe1291477e24b88c9d53e