From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 5 May 2007 00:53:23 +0000 (+0000)
Subject: merge of '931339025721c1ed37ba577e4e0f5ad191fe3568'
X-Git-Tag: Release-2010-05/1~8868^2~261^2~27^2~34^2~2^2~5^2^2^2~1^2~2^2^2~2^2^2~6^2^2~1^2~1^2^2~1^2^2^2^2~2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=301a2db4b096c81c2a5da6b4064f5c781ad1aae7;p=openembedded.git

Merge ... '931339025721c1ed37ba577e4e0f5ad191fe3568'
     and 'f9d679b49c9ccfedc3565929011b677de9852036'
---

301a2db4b096c81c2a5da6b4064f5c781ad1aae7