From: Jamie Lenehan <lenehan@twibble.org>
Date: Thu, 14 Jun 2007 04:59:11 +0000 (+0000)
Subject: merge of '47eb1f067c7af4c1a56a27e9e25ea10f002e49de'
X-Git-Tag: Release-2010-05/1~8868^2~390^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd7ba11d6666ef8820b47ce518f00a37704d5398;p=openembedded.git

Merge ... '47eb1f067c7af4c1a56a27e9e25ea10f002e49de'
     and 'dcc1e6dd9b8e054e68546059822d195903076b31'
---

fd7ba11d6666ef8820b47ce518f00a37704d5398