From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 6 Apr 2007 14:31:31 +0000 (+0000)
Subject: merge of '0f9d9fcab0aab1ca6ebbb7e543fe8cb59479fbeb'
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~4^2~1^2~1^2^2^2^2^2~1^2^2^2~1^2^2^2^2~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c962092dd3732aee3e7ea353f5cb20a5536a9c21;p=openembedded.git

Merge ... '0f9d9fcab0aab1ca6ebbb7e543fe8cb59479fbeb'
     and 'd06fd2cd0014c2f9c2fa5c5046bfbb73145ca6e5'
---

c962092dd3732aee3e7ea353f5cb20a5536a9c21