From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 25 May 2007 04:13:34 +0000 (+0000)
Subject: merge of '3524b1de858df7cc6c88667817fb70332cf4b03e'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b589b97b55a04a5388e09abf43ab1f8abcd39809;p=openembedded.git

Merge ... '3524b1de858df7cc6c88667817fb70332cf4b03e'
     and 'cb41a381e7a0c491e5968be15cd985dc75d92aaf'
---

b589b97b55a04a5388e09abf43ab1f8abcd39809