From: Phil Blundell <philb@gnu.org>
Date: Thu, 21 Aug 2008 20:08:01 +0000 (+0000)
Subject: merge of 'b384c5e2d3593861ccd01660d94e43bb59e544f5'
X-Git-Tag: Release-2010-05/1~6305
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c2c74a5392a84d7e1a1c7956816c05a4e6cf812;p=openembedded.git

Merge ... 'b384c5e2d3593861ccd01660d94e43bb59e544f5'
     and 'c6e676976a508cca50994dea712f87c53dd64c2e'
---

2c2c74a5392a84d7e1a1c7956816c05a4e6cf812