From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 27 Apr 2007 23:18:20 +0000 (+0000)
Subject: merge of '006d6113a94568f91a2927f810dc644c5b7adc06'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=870afc5638e2231410ade7765d9dd0fe851d4e9f;p=openembedded.git

Merge ... '006d6113a94568f91a2927f810dc644c5b7adc06'
     and 'f8b383b38cf0d8df1ccc5bccd2a776bc1bca1ae9'
---

870afc5638e2231410ade7765d9dd0fe851d4e9f