From: Rod Whitby <rod@whitby.id.au>
Date: Wed, 6 Jun 2007 10:57:51 +0000 (+0000)
Subject: merge of '4567013523400a8e89a74ec7813771456b7ffb5f'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a892688c0f2f59890c58404501a1004370eb494;p=openembedded.git

Merge ... '4567013523400a8e89a74ec7813771456b7ffb5f'
     and 'da99b108ae9f4e870b88f462ead9e47a3061c730'
---

7a892688c0f2f59890c58404501a1004370eb494