From: Rod Whitby <rod@whitby.id.au>
Date: Sat, 2 Jun 2007 06:46:53 +0000 (+0000)
Subject: merge of 'eb047a6635d08630dddbc92ab294e878aaa9be5f'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6225be66864fbca0c2f0df89497792464e8a00d;p=openembedded.git

Merge ... 'eb047a6635d08630dddbc92ab294e878aaa9be5f'
     and 'eb4cd1c080a17fb433c19d31a7e5bc09462243a4'
---

c6225be66864fbca0c2f0df89497792464e8a00d