From: Rod Whitby <rod@whitby.id.au>
Date: Thu, 7 Jun 2007 02:35:05 +0000 (+0000)
Subject: merge of '2ae8bcb602805ae4e0f884f4105f92526dd1c0db'
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
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e17f64cbb6e62e22364de69fcf24931ca5557e9;p=openembedded.git

Merge ... '2ae8bcb602805ae4e0f884f4105f92526dd1c0db'
     and '604336daca6c8f90c9634e4ee03d9a34dc153fc2'
---

3e17f64cbb6e62e22364de69fcf24931ca5557e9