From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 21 May 2007 11:39:29 +0000 (+0000)
Subject: merge of '9f8dec37506722f0949550fe1cb9c966bcac3ffc'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d7d4d04328d1a7410ddecd2da00ce5da86e6750;p=openembedded.git

Merge ... '9f8dec37506722f0949550fe1cb9c966bcac3ffc'
     and 'd7b4e8f0922d96a2e6925c4de33ef16e6ce376f0'
---

3d7d4d04328d1a7410ddecd2da00ce5da86e6750