From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 28 May 2007 22:29:43 +0000 (+0000)
Subject: merge of '666265b4a513b90901fd852c4b1edc1997feefd1'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f165438f9b517ba751278d4175252471f03c291c;p=openembedded.git

Merge ... '666265b4a513b90901fd852c4b1edc1997feefd1'
     and '9a5743f40b7e8b6c87c1e54d50262a06068b8b94'
---

f165438f9b517ba751278d4175252471f03c291c