From: Jamie Lenehan <lenehan@twibble.org>
Date: Sat, 2 Jun 2007 07:17:32 +0000 (+0000)
Subject: merge of '153830195ef2863a9465bcab1705eec7215fd6ba'
X-Git-Tag: Release-2010-05/1~8868^2~400^2~94^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7698082f9014b3474a7b5ab92ac5b463647ae05b;p=openembedded.git

Merge ... '153830195ef2863a9465bcab1705eec7215fd6ba'
     and 'eb047a6635d08630dddbc92ab294e878aaa9be5f'
---

7698082f9014b3474a7b5ab92ac5b463647ae05b